 |
 |
| Commit in hps-java/src/main/resources/org/lcsim/hps/steering on MAIN | |||
| OfflineTrackingAxial.lcsim | +9 | -2 | 1.3 -> 1.4 |
| HPSTrackingDefaultsRecon.lcsim | +9 | -2 | 1.1 -> 1.2 |
| SVTMonitoring.lcsim | +9 | -3 | 1.6 -> 1.7 |
| OnlineTracking.lcsim | +9 | -2 | 1.14 -> 1.15 |
| TestRunMonitoring.lcsim | +8 | -2 | 1.21 -> 1.22 |
| TestRunEventDisplay.lcsim | +8 | -2 | 1.7 -> 1.8 |
| EcalGainDriverSim.lcsim | +8 | -2 | 1.5 -> 1.6 |
| MPAlignment.lcsim | +10 | -5 | 1.2 -> 1.3 |
| EcalGainDriver.lcsim | +8 | -2 | 1.6 -> 1.7 |
| FakeHitTracking.lcsim | +34 | -14 | 1.4 -> 1.5 |
| MultScatAna.lcsim | +15 | -7 | 1.8 -> 1.9 |
| HPSTrackingDefaults.lcsim | +10 | -3 | 1.9 -> 1.10 |
| TestRunOfflineRecon.lcsim | +9 | -3 | 1.7 -> 1.8 |
| HPSTestRunPairTrigger.lcsim | +1 | -1 | 1.4 -> 1.5 |
| HpsTestRunSim.lcsim | +8 | -2 | 1.2 -> 1.3 |
| HPSTrackingBunchedMC.lcsim | +9 | -2 | 1.2 -> 1.3 |
| +164 | -54 | ||
Consequence from pulling out HelicalTrackHit construction from track reconstruction.
diff -u -r1.3 -r1.4 --- OfflineTrackingAxial.lcsim 14 Aug 2012 00:58:03 -0000 1.3 +++ OfflineTrackingAxial.lcsim 25 Nov 2012 21:57:41 -0000 1.4 @@ -10,6 +10,7 @@
<driver name="RawTrackerHitFitterDriver"/>
<driver name="TrackerHitDriver"/>
<!-- <driver name="SVTHitRecoPlots"/> -->
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="TrackingReconstructionPlots"/>
<driver name="LCIOWriter"/>
@@ -63,12 +64,18 @@
<eventInterval>1</eventInterval>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> +
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.AxialTrackReconDriver">
<debug>true</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
diff -u -r1.1 -r1.2 --- HPSTrackingDefaultsRecon.lcsim 27 Aug 2012 22:42:19 -0000 1.1 +++ HPSTrackingDefaultsRecon.lcsim 25 Nov 2012 21:57:41 -0000 1.2 @@ -13,6 +13,7 @@
<driver name="SVTBadChannelFilterDriver"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver"/>
<driver name="LCIOWriter"/>
</execute>
@@ -36,12 +37,18 @@
<driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> +
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="LCIOWriter"
diff -u -r1.6 -r1.7 --- SVTMonitoring.lcsim 20 Nov 2012 23:32:22 -0000 1.6 +++ SVTMonitoring.lcsim 25 Nov 2012 21:57:41 -0000 1.7 @@ -13,6 +13,7 @@
<driver name="TrackerHitDriver" />
<driver name="SVTHitRecoPlots"/>
+ <driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" /> <!-- <driver name="SVTSimpleEventDisplay"/>--> <!-- <driver name="TrackTimePlots"/>-->
@@ -44,12 +45,17 @@
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
<!-- <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->
diff -u -r1.14 -r1.15 --- OnlineTracking.lcsim 14 Aug 2012 00:58:03 -0000 1.14 +++ OnlineTracking.lcsim 25 Nov 2012 21:57:41 -0000 1.15 @@ -16,6 +16,7 @@
<driver name="RawTrackerHitFitterDriver"/>
<driver name="TrackerHitDriver"/>
<driver name="SVTHitRecoPlots"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="TrackingReconstructionPlots"/>
<!-- <driver name="SVTHitCorrPlots"/> -->
@@ -88,12 +89,18 @@
<eventInterval>1000</eventInterval>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> +
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
diff -u -r1.21 -r1.22 --- TestRunMonitoring.lcsim 14 Aug 2012 00:58:03 -0000 1.21 +++ TestRunMonitoring.lcsim 25 Nov 2012 21:57:41 -0000 1.22 @@ -13,6 +13,7 @@
<driver name="EcalClusterer"/>
<driver name="RawTrackerHitFitterDriver"/>
<driver name="TrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<!-- <driver name="EcalDaqPlots"/>-->
<driver name="EcalMonitoringPlots"/>
@@ -61,11 +62,16 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver">
<debug>false</debug>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="SVTSimpleEventDisplay" type="org.lcsim.hps.monitoring.svt.SVTSimpleEventDisplay">
<inputCollection>SVTRawTrackerHits</inputCollection>
diff -u -r1.7 -r1.8 --- TestRunEventDisplay.lcsim 14 Aug 2012 00:58:03 -0000 1.7 +++ TestRunEventDisplay.lcsim 25 Nov 2012 21:57:41 -0000 1.8 @@ -14,6 +14,7 @@
<driver name="EcalEventMonitor"/>
<driver name="RawTrackerHitFitterDriver"/>
<driver name="TrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="SVTSimpleEventDisplay"/>
<driver name="SVTEventDisplay"/>
@@ -42,11 +43,16 @@
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
<driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver">
<debug>false</debug>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="EcalDaqPlots" type="org.lcsim.hps.monitoring.ecal.EcalDaqPlots">
</driver>
diff -u -r1.5 -r1.6 --- EcalGainDriverSim.lcsim 31 Aug 2012 01:30:47 -0000 1.5 +++ EcalGainDriverSim.lcsim 25 Nov 2012 21:57:41 -0000 1.6 @@ -13,6 +13,7 @@
<driver name="EcalTriggerFilter"/>
<driver name="EcalTriggerClusterer"/>
<!-- <driver name="TrackerDigiDriver"/>-->
+<!-- <driver name="HelicalTrackHitDriver"/>-->
<!-- <driver name="TrackerReconDriver"/>-->
<driver name="EcalGainDriver"/>
<!--
@@ -55,12 +56,17 @@
type="org.lcsim.hps.recon.tracking.TrackerDigiDriver">
<debug>false</debug>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="LCIOWriter"
type="org.lcsim.util.loop.LCIODriver">
diff -u -r1.2 -r1.3 --- MPAlignment.lcsim 14 Nov 2012 22:08:23 -0000 1.2 +++ MPAlignment.lcsim 25 Nov 2012 21:57:41 -0000 1.3 @@ -6,7 +6,7 @@
<!--<fileRegExp baseDir="./../data/mc/SVT-CF-THINSI" >.*</fileRegExp>-->
</inputFiles>
<control>
- <numberOfEvents>10000</numberOfEvents>
+ <numberOfEvents>1000</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
</control>
@@ -16,6 +16,7 @@
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
@@ -52,7 +53,7 @@
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
</driver>
- <driver name="HelicalTrackHitResidualsDriver" type="org.lcsim.hps.users.phansson.HelicalTrackHitResidualsDriver">
+ <driver name="HelicalTrackHitResidualsDriver" type="org.lcsim.hps.recon.tracking.HelicalTrackHitResidualsDriver">
<debug>false</debug>
<hideFrame>false</hideFrame>
</driver>
@@ -75,13 +76,17 @@
<correctT0Shift>true</correctT0Shift>
</driver>
<driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <!--<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-135.xml</strategyResource>-->
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
diff -u -r1.6 -r1.7 --- EcalGainDriver.lcsim 27 Aug 2012 22:42:19 -0000 1.6 +++ EcalGainDriver.lcsim 25 Nov 2012 21:57:42 -0000 1.7 @@ -13,6 +13,7 @@
<driver name="EcalClusterer"/> <!-- <driver name="RawTrackerHitFitterDriver"/> --> <!-- <driver name="TrackerHitDriver"/> -->
+<!-- <driver name="HelicalTrackHitDriver"/> -->
<!-- <driver name="TrackerReconDriver"/>-->
<driver name="EcalGainDriver"/>
@@ -61,12 +62,17 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
diff -u -r1.4 -r1.5 --- FakeHitTracking.lcsim 19 Nov 2012 22:13:49 -0000 1.4 +++ FakeHitTracking.lcsim 25 Nov 2012 21:57:42 -0000 1.5 @@ -3,11 +3,11 @@
<!--
Steering file used to run fake hit tracking
author: Per Hansson <[log in to unmask]>
- version: $Id: FakeHitTracking.lcsim,v 1.4 2012/11/19 22:13:49 omoreno Exp $
+ version: $Id: FakeHitTracking.lcsim,v 1.5 2012/11/25 21:57:42 phansson Exp $
-->
<inputFiles>
- <file>${inputFile}</file>
+ <!--<file>${inputFile}</file>-->
</inputFiles>
<control>
@@ -21,17 +21,24 @@
<driver name="CreateHelixTracks" />
<driver name="DataTrackerFakeHitDriver" />
<!-- SVT -->
+ <!-- No time evolution --> + <driver name="TrackerDigiDriver" /> + <driver name="DataTrackerHitDriver" /> + + <!-- Time evolution
<driver name="SimpleSvtTrigger" />
<driver name="SVTReadout" />
<driver name="Digitization" />
<driver name="DataProcessing" />
- <driver name="RawTrackerHitFitterDriver" /> - <driver name="TrackerHitDriver" />
+ <driver name="RawTrackerHitFitterDriver" /> + <driver name="TrackerHitDriver" /> + --> + <driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
<driver name="CmpGenToFittedTracksDriver" />
<driver name="HelicalTrackHitResidualsDriver" />
- <driver name="ClockDriver" /> - <driver name="CleanupDriver" />
+ <driver name="ClockDriver" /> + <driver name="CleanupDriver" />
</execute>
<drivers>
@@ -44,9 +51,9 @@
</driver>
<driver name="CreateHelixTracks" type="org.lcsim.hps.users.phansson.ParticleHelixProducer">
- <debug>false</debug> - <hideFrame>true</hideFrame> - <saveSingleTrack>true</saveSingleTrack>
+ <debug>true</debug> + <hideFrame>false</hideFrame> + <saveSingleTrack>false</saveSingleTrack>
<noTopTracks>false</noTopTracks>
<noBottomTracks>false</noBottomTracks>
<trackOutputCollectionName>MCParticle_HelicalTrackFit</trackOutputCollectionName>
@@ -55,11 +62,15 @@
<driver name="DataTrackerFakeHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerFakeHitDriver">
<trackCollectionName>MCParticle_HelicalTrackFit</trackCollectionName>
<debug>true</debug>
- <hideFrame>true</hideFrame>
+ <hideFrame>false</hideFrame>
<createSimTrackerHits>true</createSimTrackerHits>
<doHth>false</doHth>
</driver>
-
+ <driver name="TrackerDigiDriver" + type="org.lcsim.hps.users.meeg.SimpleTrackerDigiDriver"> + <readoutCollectionName>FakeTrackerHits</readoutCollectionName> + <debug>false</debug> + </driver>
<driver name="SimpleSvtTrigger" type="org.lcsim.hps.users.omoreno.SimpleSvtTrigger">
<debug>true</debug>
<numberOfSvtLayers>10</numberOfSvtLayers>
@@ -98,13 +109,22 @@
<driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" >
<debug>true</debug>
</driver>
+ <driver name="DataTrackerHitDriver" type="org.lcsim.hps.recon.tracking.TrackerHitDriver" > + <debug>true</debug> + <readoutCollectionName>FakeTrackerHits</readoutCollectionName> + </driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> +
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>true</debug>
- <runHelicalTrackHitDriver>true</runHelicalTrackHitDriver>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="HelicalTrackHitResidualsDriver" type="org.lcsim.hps.users.phansson.HelicalTrackHitResidualsDriver">
diff -u -r1.8 -r1.9 --- MultScatAna.lcsim 20 Nov 2012 23:25:09 -0000 1.8 +++ MultScatAna.lcsim 25 Nov 2012 21:57:42 -0000 1.9 @@ -14,6 +14,7 @@
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
-->
<driver name="EcalRawConverter" />
@@ -26,9 +27,9 @@
<driver name="MultScatAnaDriver"/>
<driver name="GainCalibrationDriver"/>
-->
- <driver name="TrigRateDriver"/> - <driver name="CleanupDriver"/>
+ <driver name="TrigRateDriver"/>
<!--
+ <driver name="CleanupDriver"/>
<driver name="LCIOWriter"/>
-->
</execute>
@@ -78,23 +79,30 @@
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <runNumber>1351</runNumber>
+ </driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1000</eventInterval>
+ <eventInterval>100</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
diff -u -r1.9 -r1.10 --- HPSTrackingDefaults.lcsim 31 Aug 2012 01:30:47 -0000 1.9 +++ HPSTrackingDefaults.lcsim 25 Nov 2012 21:57:42 -0000 1.10 @@ -11,6 +11,7 @@
<driver name="EventMarkerDriver"/>
<driver name="HPSCalibrationDriver"/>
<driver name="TrackerDigiDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="LCIOWriter"/>
</execute>
@@ -29,13 +30,19 @@
<!-- <dropBadChannels>true</dropBadChannels>-->
<debug>false</debug>
</driver>
-
+ + <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> +
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="LCIOWriter"
diff -u -r1.7 -r1.8 --- TestRunOfflineRecon.lcsim 27 Aug 2012 22:42:19 -0000 1.7 +++ TestRunOfflineRecon.lcsim 25 Nov 2012 21:57:42 -0000 1.8 @@ -6,6 +6,7 @@
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
@@ -22,12 +23,17 @@
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
diff -u -r1.4 -r1.5 --- HPSTestRunPairTrigger.lcsim 20 Nov 2012 23:32:22 -0000 1.4 +++ HPSTestRunPairTrigger.lcsim 25 Nov 2012 21:57:42 -0000 1.5 @@ -65,7 +65,7 @@
</driver>
<driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver"/>
<driver name="MCParticlePlots" type="org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver">
- <hideFrame>false</hideFrame>
+ <hideFrame>true</hideFrame>
</driver>
<driver name="TriggerTurnOnAnalysis" type="org.lcsim.hps.users.phansson.TriggerTurnOnAnalysis">
<aidaFileName>${outputFile}</aidaFileName>
diff -u -r1.2 -r1.3 --- HpsTestRunSim.lcsim 21 Sep 2012 23:44:31 -0000 1.2 +++ HpsTestRunSim.lcsim 25 Nov 2012 21:57:42 -0000 1.3 @@ -26,6 +26,7 @@
<!-- Recon -->
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
<driver name="ClockDriver" />
<driver name="CleanupDriver" />
@@ -102,12 +103,17 @@
<debug>false</debug>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver" />
diff -u -r1.2 -r1.3 --- HPSTrackingBunchedMC.lcsim 30 Aug 2012 00:08:44 -0000 1.2 +++ HPSTrackingBunchedMC.lcsim 25 Nov 2012 21:57:42 -0000 1.3 @@ -16,6 +16,7 @@
<driver name="EventMarkerDriver"/>
<driver name="SVTSetupDriver"/>
<driver name="TrackerDigiDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="AnalysisDriver"/>
<!-- <driver name="LCIOWriter"/> -->
@@ -37,12 +38,18 @@
<debug>false</debug>
</driver>
+ <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HPSHelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> +
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-Lyr50.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance>
</driver>
<driver name="AnalysisDriver" type="org.lcsim.hps.users.mgraham.FastTrackAnalysisDriver">
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1