1 removed + 6 modified, total 7 files
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim 2014-04-17 01:26:16 UTC (rev 495)
@@ -19,6 +19,7 @@
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
<driver name="GBLDriver"/>
+ <driver name="CleanupDriver"/>
</execute>
<drivers>
@@ -68,10 +69,7 @@
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
-
-
-
</drivers>
</lcsim>
\ No newline at end of file
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim 2014-04-17 01:26:16 UTC (rev 495)
@@ -16,7 +16,9 @@
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
<driver name="ReconParticle" />
+ <driver name="GBLDriver"/>
<driver name="LCIOWriter"/>
+ <driver name="CleanupDriver"/>
</execute>
<drivers>
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
@@ -42,6 +44,12 @@
<driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
+ <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+ <debug>0</debug>
+ <isMC>false</isMC>
+ <gblFileName></gblFileName>
+ </driver>
+
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>true</use2014Gain>
@@ -55,5 +63,6 @@
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim 2014-04-17 01:26:16 UTC (rev 495)
@@ -1,59 +0,0 @@
-<!--
- Offline reconstruction for 2014 (electron run) data.
- @author Sho Uemura <[log in to unmask]>
- @version $Id: HPS2014OfflineRecon.lcsim,v 1.7 2013/10/30 16:23:32 phansson Exp $
--->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
- <execute>
- <driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
- <driver name="RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="EcalRawConverter" />
- <driver name="EcalClusterer" />
- <driver name="ReconParticle" />
- <driver name="LCIOWriter"/>
- </execute>
- <drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>${runNumber}</runNumber>-->
- </driver>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1000</eventInterval>
- </driver>
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
- <fitAlgorithm>Analytic</fitAlgorithm>
- <useTimestamps>false</useTimestamps>
- <correctT0Shift>false</correctT0Shift>
- <useTruthTime>true</useTruthTime>
- </driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
- <debug>false</debug>
- <clusterTimeCut>8.0</clusterTimeCut>
- <maxSeperation>20.0</maxSeperation>
- <tolerance>1.0</tolerance>
- </driver>
- <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
- <debug>false</debug>
- </driver>
- <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <use2014Gain>true</use2014Gain>
- </driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
- </driver>
- <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${outputFile}.slcio</outputFilePath>
- </driver>
- </drivers>
-</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim 2014-04-17 01:26:16 UTC (rev 495)
@@ -17,13 +17,14 @@
<driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver"/>
<driver name="LCIOWriter"/>
+ <driver name="CleanupDriver"/>
</execute>
<drivers>
<driver name="SVTBadChannelFilterDriver" type="org.hps.recon.tracking.SVTBadChannelFilterDriver"/>
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
+ <!-- <runNumber>1351</runNumber> -->
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
@@ -57,6 +58,7 @@
type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}</outputFilePath>
</driver>
-
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim 2014-04-17 01:26:16 UTC (rev 495)
@@ -18,6 +18,7 @@
<driver name="EcalClusterer" />
<driver name="ReconParticle" />
<driver name="LCIOWriter"/>
+ <driver name="CleanupDriver"/>
</execute>
<drivers>
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
@@ -54,5 +55,6 @@
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim 2014-04-17 01:26:16 UTC (rev 495)
@@ -11,11 +11,12 @@
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
<driver name="TwoTrackFilter"/>
-
+ <driver name="CleanupDriver"/>
+
</execute>
<drivers>
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>${runNumber}</runNumber>-->
+ <!-- <runNumber>${runNumber}</runNumber>-->
</driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
@@ -46,8 +47,10 @@
</driver>
<driver name="TwoTrackFilter"
type="org.hps.util.TwoTrackFilterDriver">
- <debug>false</debug>
- <outputFilePath>${outputFile}</outputFilePath>
- </driver>
+ <debug>false</debug>
+ <outputFilePath>${outputFile}</outputFilePath>
+ </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+
</drivers>
</lcsim>
java/trunk/tracking/src/main/java/org/hps/recon/tracking
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackerReconDriver.java 2014-04-17 01:16:54 UTC (rev 494)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackerReconDriver.java 2014-04-17 01:26:16 UTC (rev 495)
@@ -2,14 +2,12 @@
import hep.physics.vec.BasicHep3Vector;
-import java.util.Arrays;
import java.util.List;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver;
import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
import org.lcsim.recon.tracking.seedtracker.diagnostic.SeedTrackerDiagnostics;
@@ -34,8 +32,6 @@
Detector detector = null;
// Default B-field value.
private double bfield = 0.5;
- // TrackerHit readout name for readout cleanup.
- private String trackerReadoutName = "TrackerHits";
// Tracking strategies resource path.
private String strategyResource = "HPS-Test-4pt1.xml";
// Output track collection.
@@ -147,11 +143,6 @@
// stFinal.setSectorParams(false); //this doesn't actually seem to do anything
stFinal.setSectorParams(1, 10000);
add(stFinal);
-
- //
- // 2) Cleanup the readouts for next event.
- //
- add(new ReadoutCleanupDriver(Arrays.asList(this.trackerReadoutName)));
}
/**
SVNspam 0.1