Author: [log in to unmask]
Date: Mon Apr 13 22:56:02 2015
New Revision: 2687
Log:
Fix broken steering files so they initialize successfully.
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.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/celentan/LedAnalysisFromEvio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalScoring.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/EcalLedSequenceMonitor.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim Mon Apr 13 22:56:02 2015
@@ -40,7 +40,6 @@
<eventRefreshRate>2</eventRefreshRate>
</driver>
<driver name="LedAnalysisDriver" type="org.hps.monitoring.ecal.plots.EcalLedSequenceMonitor">
- <isEmbedded>true</isEmbedded>
<isMonitoringApp>false</isMonitoringApp>
<skipMin>0.25</skipMin>
<skipInitial>0.05</skipInitial>
@@ -54,4 +53,4 @@
<outputFileName>LedSequenceMonitorOut.aida</outputFileName>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim Mon Apr 13 22:56:02 2015
@@ -24,8 +24,8 @@
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalReadoutToTriggerConverterDriver">
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<!--<integralWindow>35</integralWindow> Deprecated, now use the equivalent in NSA/NSB-->
- <nsa>120</nsa>
- <nsb>20</nsb>
+ <!--<nsa>120</nsa>-->
+ <!--<nsb>20</nsb>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
<dropBadFADC>true</dropBadFADC>
<tp>14.0</tp>
@@ -73,4 +73,4 @@
<outputFileName>triggerPlots</outputFileName>
</driver>
</drivers>
-</lcsim>
+</lcsim>
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 Mon Apr 13 22:56:02 2015
@@ -12,10 +12,8 @@
<driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
<!-- <driver name="SVTSimpleEventDisplay"/>-->
-<!-- <driver name="TrackTimePlots"/>-->
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
- <driver name="TrackingReconstructionPlots" />
<driver name="CleanupDriver" />
<driver name="AidaSaveDriver" />
</execute>
@@ -51,9 +49,6 @@
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
-<!-- <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->
- </driver>
<driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<inputCollection>SVTRawTrackerHits</inputCollection>
<singleEvent>false</singleEvent>
@@ -69,7 +64,6 @@
<driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
- <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots" />
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
@@ -77,4 +71,4 @@
<outputFileName>svtmon_plots2</outputFileName>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim Mon Apr 13 22:56:02 2015
@@ -23,12 +23,11 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>
- <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
- <runNumber>3422</runNumber>
- <freeze>true</freeze>
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+ <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
+ <runNumber>3422</runNumber>
+ <freeze>true</freeze>
+ </driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
<rejectBackground>false</rejectBackground>
@@ -87,4 +86,4 @@
<!--collectionNames>TrackerHits</collectionNames-->
</driver>
</drivers>
-</lcsim>
+</lcsim>
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 Mon Apr 13 22:56:02 2015
@@ -11,7 +11,6 @@
<!-- <driver name="SVTHitRecoPlots"/> -->
<driver name="HelicalTrackHitDriver" />
<driver name="TrackerReconDriver" />
- <driver name="TrackingReconstructionPlots" />
<driver name="LCIOWriter" />
<driver name="CleanupDriver" />
</execute>
@@ -54,10 +53,6 @@
<debug>true</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots"
- type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
- <outputPlots>trackingPlots.aida</outputPlots>
- </driver>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>/Users/mgraham/HPS/HPSData/hps_000820_trackRecon.slcio</outputFilePath>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim Mon Apr 13 22:56:02 2015
@@ -9,7 +9,6 @@
<driver name="EventMarkerDriver"/>
<driver name="EcalRunningPedestal"/>
<driver name="EcalRawConverter" />
- <driver name="LedAnalysisDriver"/>
<driver name="AidaSaveDriver"/>
</execute>
<drivers>
@@ -28,12 +27,8 @@
<useRunningPedestal>true</useRunningPedestal>
<useTimeWalkCorrection>true</useTimeWalkCorrection>
</driver>
- <driver name="LedAnalysisDriver" type="org.hps.users.celentan.LedAnalysis">
- <useRawEnergy>true</useRawEnergy>
- <energyCut>5</energyCut>
- </driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}.aida</outputFileName>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalScoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalScoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalScoring.lcsim Mon Apr 13 22:56:02 2015
@@ -8,7 +8,7 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="ECalScoringMatch"/>
+ <driver name="EcalScoringMatch"/>
<driver name="AidaSaveDriver"/>
</execute>
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 Mon Apr 13 22:56:02 2015
@@ -20,7 +20,6 @@
<driver name="TrackerReconDriver" />
<driver name="SVTEventInfo" />
<driver name="SVTHitReconstructionPlots" />
- <driver name="TrackingReconstructionPlots" />
<driver name="LCIOWriter" />
</execute>
<drivers>
@@ -48,9 +47,6 @@
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
- <outputPlots>TrackingReconstructionPlots.aida</outputPlots>
- </driver>
<driver name="SVTHitReconstructionPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<outputPlots>SVTHitReconstructionPlots.aida</outputPlots>
</driver>
@@ -60,4 +56,4 @@
<outputFilePath>${outputFile}</outputFilePath>
</driver>
</drivers>
-</lcsim>
+</lcsim>
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 Mon Apr 13 22:56:02 2015
@@ -18,7 +18,6 @@
<driver name="TrackDataDriver" />
<driver name="SVTEventInfo" />
<driver name="SVTHitReconstructionPlots" />
- <driver name="TrackingReconstructionPlots" />
<driver name="GBLDriver" />
<driver name="LCIOWriter" />
<driver name="CleanupDriver" />
@@ -57,9 +56,6 @@
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
- <outputPlots>TrackingReconstructionPlots.aida</outputPlots>
- </driver>
<driver name="SVTHitReconstructionPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<outputPlots>SVTHitReconstructionPlots.aida</outputPlots>
</driver>
@@ -71,4 +67,4 @@
<gblFileName>gblinput.txt</gblFileName>
</driver>
</drivers>
-</lcsim>
+</lcsim>
