Author: [log in to unmask]
Date: Wed Nov 19 14:07:24 2014
New Revision: 1570
Log:
Remove ConditionsDriver AND CalibrationDriver from all steering files.
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/StarterAnalysis.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.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/ECalTriggerWindowMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
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
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/StarterAnalysis.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/StarterAnalysis.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/StarterAnalysis.lcsim Wed Nov 19 14:07:24 2014
@@ -6,25 +6,17 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="ConditionsDriver" />
<driver name="SvtSensorSetup" />
-
<driver name="StarterAnalysisDriver"/>
-
<driver name="AidaSaveDriver"/>
</execute>
-
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
-
-
<driver name="StarterAnalysisDriver" type="org.hps.analysis.examples.StarterAnalysisDriver">
</driver>
-
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}</outputFileName>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim Wed Nov 19 14:07:24 2014
@@ -6,14 +6,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
-<!-- <driver name="ConditionsDriver"/> -->
</execute>
<drivers>
-<!--
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
--->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim Wed Nov 19 14:07:24 2014
@@ -2,7 +2,6 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/>
@@ -12,7 +11,6 @@
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<applyBadCrystalMap>false</applyBadCrystalMap>
<use2014Gain>false</use2014Gain>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim Wed Nov 19 14:07:24 2014
@@ -8,7 +8,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/>
@@ -16,35 +15,27 @@
<driver name="EcalWindowPlots"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
-
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<applyBadCrystalMap>false</applyBadCrystalMap>
<use2014Gain>false</use2014Gain>
</driver>
-
<driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
-
<driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
-
<driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
<inputCollection>EcalCalHits</inputCollection>
</driver>
-
<driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.plots.EcalWindowPlotsXY">
<inputCollection>EcalReadoutHits</inputCollection>
</driver>
-
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
</drivers>
</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 Wed Nov 19 14:07:24 2014
@@ -1,4 +1,3 @@
-
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
@@ -7,7 +6,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalTriggerFilter"/>
<driver name="EcalClusterer"/>
@@ -25,8 +23,6 @@
<!--<driver name="AidaSaveDriver"/>-->
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalReadoutToTriggerConverterDriver">
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<integralWindow>35</integralWindow>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim Wed Nov 19 14:07:24 2014
@@ -1,4 +1,3 @@
-
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
@@ -8,7 +7,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="FADCConverter"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -26,8 +24,6 @@
-->
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- </driver>
<driver name="FADCConverter" type="org.hps.recon.ecal.FADCConverterDriver">
<threshold>80</threshold>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim Wed Nov 19 14:07:24 2014
@@ -8,7 +8,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="ConditionsDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/> <!-- General plots -->
@@ -16,8 +15,6 @@
<driver name="EcalClusterPlots"/> <!-- Clusters distributions -->
<driver name="EcalDaqPlots"/> <!-- DAQ Plots -->
<driver name="EcalEventDisplay"/> <!-- Ecal event display -->
-
-
<!-- <driver name="EcalWindowPlots"/> -->
<!-- <driver name="EcalEvsX"/> -->
@@ -35,43 +32,32 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
-
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<!-- <threshold>150</threshold>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
<!-- <dropBadFADC>true</dropBadFADC>-->
</driver>
-
<!-- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">-->
<driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterIC">
<!-- <clusterWindow>32.0</clusterWindow>-->
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
-
<driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
-
<driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
<maxE>2.0</maxE>
<logScale>true</logScale>
</driver>
-
<driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
<maxE>2.0</maxE>
<logScale>false</logScale>
</driver>
-
<driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
<inputCollection>EcalCalHits</inputCollection>
</driver>
-
<driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
<inputCollection>EcalCalHits</inputCollection>
<inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
@@ -82,8 +68,6 @@
<minEch>-0.01</minEch>
<eventRefreshRate>100</eventRefreshRate>
</driver>
-
-
<!-- Here are commented drivers -->
<!--<driver name="RunControlDriver" type="org.hps.util.RunControlDriver"> -->
@@ -93,25 +77,18 @@
<targetZ>674</targetZ>
<inputCollection>EcalClusters</inputCollection>
</driver> -->
-
<!-- <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.plots.EcalWindowPlots">
<inputCollection>EcalReadoutHits</inputCollection>
</driver> -->
-
<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>-->
-
-
<!-- <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
<clusterEnergyCut>0.500</clusterEnergyCut>
</driver>-->
-
<!-- <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>triggerEPlots</outputFileName>
</driver> -->
-
-
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim Wed Nov 19 14:07:24 2014
@@ -1,17 +1,13 @@
<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="ConditionsDriver"/>
<driver name="EventMarkerDriver"/>
<driver name="EcalMonitoringTestDriver"/>
</execute>
<drivers>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
<driver name="EcalMonitoringTestDriver" type="org.hps.monitoring.drivers.example.EcalMonitoringTestDriver"/>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim Wed Nov 19 14:07:24 2014
@@ -12,4 +12,4 @@
<driver name="TestRunReconDriver" type="org.hps.users.jeremym.TestRunReconDriver"/>
<driver name="ExamplePlotDriver" type="org.hps.monitoring.drivers.example.ExamplePlotDriver" />
</drivers>
-</lcsim>
+</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 Wed Nov 19 14:07:24 2014
@@ -8,31 +8,29 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="SVTSetupDriver"/>
- <driver name="EcalRawConverter"/>
+ <driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
- <driver name="SVTOccupancyPlots"/>
+ <driver name="SVTOccupancyPlots"/>
<driver name="SVTEventPlots"/>
- <driver name="SVTPulsePlots"/>
+ <driver name="SVTPulsePlots"/>
<driver name="RawTrackerHitFitterDriver"/>
- <driver name="TrackerHitDriver"/>
- <driver name="SVTHitRecoPlots"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="TrackingReconstructionPlots"/>
+ <driver name="TrackerHitDriver"/>
+ <driver name="SVTHitRecoPlots"/>
+ <driver name="HelicalTrackHitDriver"/>
+ <driver name="TrackerReconDriver"/>
+ <driver name="TrackingReconstructionPlots"/>
<!-- <driver name="SVTHitCorrPlots"/> -->
<!-- <driver name="LCIOWriter"/> -->
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="EcalRawConverter"
- type="org.hps.recon.ecal.EcalRawConverterDriver">
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+ <ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>false</use2014Gain>
</driver>
- <driver name="EcalClusterer"
- type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
+ <ecalName>Ecal</ecalName>
+ <ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="RawTrackerHitFitterDriver"
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim Wed Nov 19 14:07:24 2014
@@ -1,10 +1,7 @@
-
<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="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="RawTrackerHitFitterDriver"/>
@@ -14,49 +11,36 @@
<driver name="SVTBasicMonitoringPlots"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
-
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver"/>
-
<driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
-
<driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
-
<driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
-
<driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver"/>
-
<driver name="CleanupDriver"
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
-
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
<driver name="HelicalTrackHitDriver" type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
-
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
-
<driver name="SVTBasicMonitoringPlots" type="org.hps.monitoring.drivers.svt.BasicMonitoringPlotsDriver">
<inputCollection>SVTRawTrackerHits</inputCollection>
<singleEvent>false</singleEvent>
</driver>
-
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim Wed Nov 19 14:07:24 2014
@@ -1,4 +1,3 @@
-
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
@@ -8,24 +7,16 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
-
- <driver name="CalibrationDriver"/>
-
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
-
<driver name="RawTrackerHitFitterDriver"/>
<driver name="TrackerHitDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
-
<driver name="SVTSimpleEventDisplay"/>
-
<driver name="CleanupDriver"/>
-
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
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 Wed Nov 19 14:07:24 2014
@@ -2,7 +2,6 @@
<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="SVTPulsePlots"/>
@@ -29,9 +28,6 @@
<driver name="RunControlDriver" type="org.hps.util.RunControlDriver"/>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
- </driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>17</runNumber> -->
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim Wed Nov 19 14:07:24 2014
@@ -7,7 +7,6 @@
<printDriversDetailed>true</printDriversDetailed>
</control>
<execute>
- <driver name="CalibrationDriver"/>
<driver name="EventMarkerDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -19,10 +18,8 @@
<driver name="SVTSimpleEventDisplay"/>
<driver name="SVTEventDisplay"/>
<driver name="CleanupDriver"/>
-
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<singleEvent>true</singleEvent>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim Wed Nov 19 14:07:24 2014
@@ -8,7 +8,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="RawTrackerHitFitterDriver"/>
@@ -28,7 +27,6 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim Wed Nov 19 14:07:24 2014
@@ -5,7 +5,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="RawTrackerHitFitterDriver"/>
@@ -19,7 +18,6 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/production/DataQualityRecon.lcsim Wed Nov 19 14:07:24 2014
@@ -7,7 +7,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<!-- <driver name="DQMDatabaseDriver"/> -->
- <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="SVTMonitoring"/>
<driver name="SVTHitMCEfficiency"/>
@@ -21,9 +20,6 @@
</execute>
<drivers>
<!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> -->
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>1351</runNumber> -->
- </driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim Wed Nov 19 14:07:24 2014
@@ -22,7 +22,6 @@
<driver name="ClockDriver"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim Wed Nov 19 14:07:24 2014
@@ -17,7 +17,6 @@
<driver name="TestRunReconToLcio"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim Wed Nov 19 14:07:24 2014
@@ -1,12 +1,10 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
</control>
-
<execute>
<driver name="EventMarkerDriver"/>
<driver name="SvtSensorSetup" />
@@ -21,23 +19,18 @@
<driver name="GBLDriver"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
-
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
</driver>
-
- <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+ <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
<debug>0</debug>
<isMC>${isMC}</isMC>
<gblFileName>gblinput.txt</gblFileName>
</driver>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
-
<!-- Reconstruction drivers below -->
-
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
@@ -64,8 +57,6 @@
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
-
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim Wed Nov 19 14:07:24 2014
@@ -1,12 +1,9 @@
-
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
<control>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
</control>
-
<execute>
<driver name="EventMarkerDriver"/>
<driver name="SvtSensorSetup" />
@@ -19,7 +16,6 @@
<driver name="LCIOWriter"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim Wed Nov 19 14:07:24 2014
@@ -12,7 +12,6 @@
<driver name="EcalClusterer" />
<driver name="TwoTrackFilter"/>
<driver name="CleanupDriver"/>
-
</execute>
<drivers>
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
@@ -49,6 +48,5 @@
<outputFilePath>${outputFile}</outputFilePath>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim Wed Nov 19 14:07:24 2014
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
<inputFiles>
<file>${inputFile}</file>
</inputFiles>
-
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
</control>
-
<execute>
<driver name="EventMarkerDriver"/>
<driver name="SVTSetupDriver"/>
@@ -21,36 +18,29 @@
<driver name="AnalysisDriver"/>
<!-- <driver name="LCIOWriter"/> -->
</execute>
-
<drivers>
-
<driver name="SVTSetupDriver"
type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
</driver>
-
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
<driver name="TrackerDigiDriver"
type="org.hps.recon.tracking.TrackerDigiDriver">
<debug>false</debug>
</driver>
-
<driver name="HelicalTrackHitDriver"
type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
-
<driver name="TrackerReconDriver"
type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-Lyr50.xml</strategyResource>
</driver>
-
<driver name="AnalysisDriver" type="org.hps.users.mgraham.FastTrackAnalysisDriver">
<outputText>${output}</outputText>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim Wed Nov 19 14:07:24 2014
@@ -2,7 +2,6 @@
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"/>
@@ -15,7 +14,6 @@
<driver name="TwoTrackAnalysis" />
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim Wed Nov 19 14:07:24 2014
@@ -12,7 +12,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<!-- <driver name="EcalRawConverterDriver"/> -->
<!-- <driver name="EcalTriggerFilter"/> -->
@@ -25,8 +24,6 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
<applyBadCrystalMap>false</applyBadCrystalMap>
