Author: [log in to unmask]
Date: Fri Apr 17 01:00:59 2015
New Revision: 2731
Log:
Fix up steering files from code changes.
Removed:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim Fri Apr 17 01:00:59 2015
@@ -9,8 +9,6 @@
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
<driver name="SVTOccupancyPlots" />
- <driver name="SVTEventPlots" />
- <driver name="SVTPulsePlots" />
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver" />
<driver name="SVTHitRecoPlots" />
@@ -42,9 +40,6 @@
<clusterNeighborThreshold>3.0</clusterNeighborThreshold>
<clusterThreshold>3.0</clusterThreshold>
</driver>
- <driver name="SVTEventPlots" type="org.hps.monitoring.drivers.svt.SVTEventInfo">
- <outputPlots>svtEventInfoPlots.aida</outputPlots>
- </driver>
<driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
<outputPlots>svtHitRecoPlots.aida</outputPlots>
@@ -53,10 +48,6 @@
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
<outputPlots>svtHitRecoCorrPlots.aida</outputPlots>
- </driver>
- <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- <outputPlots>svtPulsePlots.aida</outputPlots>
</driver>
<driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim Fri Apr 17 01:00:59 2015
@@ -3,15 +3,11 @@
<execute>
<driver name="EventMarkerDriver" />
<driver name="RawTrackerHitSensorSetup" />
- <driver name="SVTPulsePlots" />
<driver name="RawTrackerHitFitterDriver" />
- <driver name="SVTPulseFitPlots" />
-<!-- <driver name="SVTMonitoringPlots"/>-->
<driver name="TrackerHitDriver" />
<driver name="SVTHitRecoPlots" />
<driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
-<!-- <driver name="SVTSimpleEventDisplay"/>-->
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
<driver name="CleanupDriver" />
@@ -49,18 +45,6 @@
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
- <inputCollection>SVTRawTrackerHits</inputCollection>
- <singleEvent>false</singleEvent>
- </driver>
- <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
- </driver>
- <driver name="SVTPulseFitPlots" type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots">
- <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
- </driver>
- <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- </driver>
<driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim Fri Apr 17 01:00:59 2015
@@ -4,11 +4,8 @@
<driver name="EventMarkerDriver" />
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
- <!-- <driver name="SVTEventPlots"/> -->
- <!-- <driver name="SVTPulsePlots"/> -->
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver" />
- <!-- <driver name="SVTHitRecoPlots"/> -->
<driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
<driver name="LCIOWriter" />
@@ -27,17 +24,9 @@
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="SVTEventPlots"
- type="org.hps.monitoring.drivers.svt.SVTEventInfo">
- <outputPlots>svtEventInfoPlots.aida</outputPlots>
- </driver>
<driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
<outputPlots>svtHitRecoPlots.aida</outputPlots>
- </driver>
- <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- <outputPlots>svtPulsePlots.aida</outputPlots>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim Fri Apr 17 01:00:59 2015
@@ -18,7 +18,6 @@
<driver name="TrackerDigiDriver"/> -->
<driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
- <driver name="SVTEventInfo" />
<driver name="SVTHitReconstructionPlots" />
<driver name="LCIOWriter" />
</execute>
@@ -50,8 +49,6 @@
<driver name="SVTHitReconstructionPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<outputPlots>SVTHitReconstructionPlots.aida</outputPlots>
</driver>
- <driver name="SVTEventInfo" type="org.hps.monitoring.drivers.svt.SVTEventInfo">
- </driver>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}</outputFilePath>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim Fri Apr 17 01:00:59 2015
@@ -16,7 +16,6 @@
<driver name="EcalClusterer" />
<driver name="ReconParticle" />
<driver name="TrackDataDriver" />
- <driver name="SVTEventInfo" />
<driver name="SVTHitReconstructionPlots" />
<driver name="GBLDriver" />
<driver name="LCIOWriter" />
@@ -59,8 +58,6 @@
<driver name="SVTHitReconstructionPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<outputPlots>SVTHitReconstructionPlots.aida</outputPlots>
</driver>
- <driver name="SVTEventInfo" type="org.hps.monitoring.drivers.svt.SVTEventInfo">
- </driver>
<driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
<debug>0</debug>
<isMC>${isMC}</isMC>
