Author: [log in to unmask]
Date: Fri Apr 17 11:41:11 2015
New Revision: 2735
Log:
Remove output files...fix names. Add L4-6 only tracking steering file for early, SVT open, running.
Added:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim
- copied, changed from r2732, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim
Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim (from r2732, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim)
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim Fri Apr 17 11:41:11 2015
@@ -4,19 +4,13 @@
Steering file for tracking and v0 reconstruction monitoring
@author Matt Graham <[log in to unmask]>
-->
- <execute>
- <driver name="EventMarkerDriver" />
+ <execute>
<!-- the 3 drivers below are for reading out 6-sample ADC data -->
<driver name="RawTrackerHitSensorSetup" />
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver" />
<driver name="HelicalTrackHitDriver" />
-<!-- SVT opening angle alignment -->
- <driver name="TrackerL1to3ReconDriver"/>
- <driver name="TrackerL4to6ReconDriver"/>
- <driver name="SVTAlignment"/>
-<!-- regular tracking and recon -->
- <driver name="FullTrackerReconDriver"/>
+ <driver name="TrackerL4to6ReconDriver"/>
<driver name="TrackDataDriver"/>
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
@@ -28,10 +22,7 @@
<driver name="V0Monitoring"/>
<driver name="CleanupDriver" />
</execute>
- <drivers>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>10</eventInterval>
- </driver>
+ <drivers>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
@@ -50,22 +41,15 @@
<tolerance>1.0</tolerance>
<saveAxialHits>false</saveAxialHits>
</driver>
- <driver name="TrackerL1to3ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
- <debug>false</debug>
- <trackCollectionName>L1to3Tracks</trackCollectionName>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L1-3.xml</strategyResource>
- </driver>
+
<driver name="TrackerL4to6ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<trackCollectionName>L4to6Tracks</trackCollectionName>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
</driver>
- <driver name="FullTrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
- <debug>false</debug>
- <trackCollectionName>MatchedTracks</trackCollectionName>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
- </driver>
+
<driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
+ <trackCollectionName>L4to6Tracks</trackCollectionName>
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
@@ -75,25 +59,22 @@
<debug>false</debug>
</driver>
<driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
- <useTimeCut>true</useTimeCut>
- <logLevel>ALL</logLevel>
+ <useTimeCut>true</useTimeCut>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <trackCollectionName>L4to6Tracks</trackCollectionName>
<debug>false</debug>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">
- <outputPlots>tracking</outputPlots>
+ <driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">
+ <trackCollectionName>L4to6Tracks</trackCollectionName>
</driver>
- <driver name="TrackingResiduals" type="org.hps.monitoring.drivers.trackrecon.TrackResiduals">
- <outputPlots>track-residuals</outputPlots>
+ <driver name="TrackingResiduals" type="org.hps.monitoring.drivers.trackrecon.TrackResiduals">
</driver>
<driver name="V0Monitoring" type="org.hps.monitoring.drivers.trackrecon.V0ReconPlots">
- <outputPlots>v0recon</outputPlots>
</driver>
- <driver name="SVTAlignment" type="org.hps.monitoring.drivers.trackrecon.SVTOpeningAlignment">
- <outputPlots>alignment</outputPlots>
- </driver>
- <driver name="TrackTime" type="org.hps.monitoring.drivers.trackrecon.TrackTimePlots">
+
+ <driver name="TrackTime" type="org.hps.monitoring.drivers.trackrecon.TrackTimePlots">
+ <trackCollectionName>L4to6Tracks</trackCollectionName>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim Fri Apr 17 11:41:11 2015
@@ -4,8 +4,7 @@
Steering file for tracking and v0 reconstruction monitoring
@author Matt Graham <[log in to unmask]>
-->
- <execute>
- <driver name="EventMarkerDriver" />
+ <execute>
<!-- the 3 drivers below are for reading out 6-sample ADC data -->
<driver name="RawTrackerHitSensorSetup" />
<driver name="RawTrackerHitFitterDriver" />
@@ -81,17 +80,13 @@
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>false</debug>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">
- <outputPlots>tracking</outputPlots>
+ <driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">
</driver>
- <driver name="TrackingResiduals" type="org.hps.monitoring.drivers.trackrecon.TrackResiduals">
- <outputPlots>track-residuals</outputPlots>
+ <driver name="TrackingResiduals" type="org.hps.monitoring.drivers.trackrecon.TrackResiduals">
</driver>
- <driver name="V0Monitoring" type="org.hps.monitoring.drivers.trackrecon.V0ReconPlots">
- <outputPlots>v0recon</outputPlots>
+ <driver name="V0Monitoring" type="org.hps.monitoring.drivers.trackrecon.V0ReconPlots">
</driver>
- <driver name="SVTAlignment" type="org.hps.monitoring.drivers.trackrecon.SVTOpeningAlignment">
- <outputPlots>alignment</outputPlots>
+ <driver name="SVTAlignment" type="org.hps.monitoring.drivers.trackrecon.SVTOpeningAlignment">
</driver>
<driver name="TrackTime" type="org.hps.monitoring.drivers.trackrecon.TrackTimePlots">
</driver>
|