Author: [log in to unmask]
Date: Sat Jan 3 18:05:58 2015
New Revision: 1843
Log:
Delete CalibrationDriver and remove references in steering files.
Removed:
java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/CalibrationDriver.java
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/calibration/EcalCalibrations.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/HPS2014OfflineRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/SVTPedestals.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.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/MultScatAna.lcsim
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/TestRunReadoutToLcio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/calibration/EcalCalibrations.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/calibration/EcalCalibrations.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/calibration/EcalCalibrations.lcsim Sat Jan 3 18:05:58 2015
@@ -8,7 +8,8 @@
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"/>
<driver name="EcalCalibrationsDriver" type="org.hps.recon.ecal.EcalCalibrationsDriver">
- <loadCalibrations>true</loadCalibrations>
+ <outputFileName>ecal_calibrations.txt</outputFileName>
+ <loadCalibrations>false</loadCalibrations>
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>EcalCalibrationPlots.aida</outputFileName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/HPS2014OfflineRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/HPS2014OfflineRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/HPS2014OfflineRecon.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,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"/>
@@ -22,9 +21,6 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>${runNumber}</runNumber>-->
- </driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalPedestalPlots"/>
<!-- <driver name="EcalRawConverter"/>-->
<!--
@@ -17,8 +16,6 @@
-->
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
</driver>
<driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -23,19 +22,13 @@
</execute>
<drivers>
-
<driver name="SVTBadChannelFilterDriver" type="org.hps.recon.tracking.SVTBadChannelFilterDriver"/>
-
<driver name="EcalGainDriver"
type="org.hps.users.phansson.ECalGainDriver">
<debug>false</debug>
<hideFrame>true</hideFrame>
<outputPlotFileName>gaindriver.aida</outputPlotFileName>
<ecalGainFileName>clusterlist.txt</ecalGainFileName>
- </driver>
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>1351</runNumber>
</driver>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalTriggerFilter"/>
@@ -30,10 +29,6 @@
<outputPlotFileName>gaindriver_sim.aida</outputPlotFileName>
<ecalGainFileName>clusterlist_sim.txt</ecalGainFileName>
<simTrigger>true</simTrigger>
- </driver>
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>1351</runNumber>
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<addNoise>true</addNoise>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim Sat Jan 3 18:05:58 2015
@@ -7,8 +7,6 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
-
- <driver name="CalibrationDriver"/>
<driver name="EcalReadout"/>
<driver name="EcalClusterer"/>
<driver name="EcalTrigger"/>
@@ -30,9 +28,6 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
- </driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/SVTPedestals.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/SVTPedestals.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/SVTPedestals.lcsim Sat Jan 3 18:05:58 2015
@@ -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="PedestalPlots"/>
<driver name="AidaSaveDriver"/>
@@ -10,9 +9,6 @@
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</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="PedestalPlots"
@@ -25,4 +21,4 @@
<outputFileName>${outputFile}</outputFileName>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim Sat Jan 3 18:05:58 2015
@@ -9,7 +9,6 @@
<printInputFiles>true</printInputFiles>
</control>
<execute>
- <driver name="CalibrationDriver"/>
<driver name="EventMarkerDriver"/>
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
@@ -24,7 +23,6 @@
<driver name="ClockDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="Writer"
type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}_ecalClusters</outputFilePath>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim Sat Jan 3 18:05:58 2015
@@ -9,7 +9,6 @@
<printInputFiles>true</printInputFiles>
</control>
<execute>
-<!-- <driver name="CalibrationDriver"/> -->
<!-- <driver name="EventMarkerDriver"/>-->
<driver name="EcalClusterer"/>
<driver name="EcalTrigger"/>
@@ -18,7 +17,6 @@
<driver name="ClockDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalClusterer"
type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<!-- <driver name="DQMDatabaseDriver"/> -->
- <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -33,9 +32,6 @@
</execute>
<drivers>
<driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</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/users/mgraham/DataQualityMonitorOnRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="DQMDatabaseDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="BadChannelFilter" />
<!-- <driver name="RawTrackerHitFitterDriver" />-->
@@ -30,9 +29,6 @@
</execute>
<drivers>
<driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</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/users/mgraham/DataQualityMonitorTestRunData.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="DQMDatabaseDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
@@ -26,9 +25,6 @@
</execute>
<drivers>
<driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</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/users/mgraham/NoTimeNoTriggerRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim Sat Jan 3 18:05:58 2015
@@ -12,7 +12,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="TrackerDigiDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="AxialTrackReconDriver"/>
@@ -30,10 +29,6 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
- </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/HPS2014DumpEcal.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim Sat Jan 3 18:05:58 2015
@@ -7,7 +7,6 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClusterer"/>
@@ -24,11 +23,6 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- </driver>
-
-
-
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<readoutPeriod>4.0</readoutPeriod>
<coincidenceWindow>2</coincidenceWindow>
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 Sat Jan 3 18:05:58 2015
@@ -13,7 +13,6 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="BadChannelFilter" />
<driver name="SimpleSVTReadout"/>
<driver name="RawTrackerHitFitterDriver"/>
@@ -36,9 +35,6 @@
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
- </driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</runNumber>
</driver>
<driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MultScatAna.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MultScatAna.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MultScatAna.lcsim Sat Jan 3 18:05:58 2015
@@ -8,8 +8,6 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
-
<!--
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
@@ -71,17 +69,6 @@
<driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
-
-
-
-
-
-
-
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>1351</runNumber>
- </driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
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 Sat Jan 3 18:05:58 2015
@@ -7,7 +7,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="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
@@ -27,9 +26,6 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</runNumber>
- </driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim Sat Jan 3 18:05:58 2015
@@ -6,7 +6,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="HPSSVTSensorSetup"/>
- <driver name="CalibrationDriver"/>
<driver name="BadChannelFilter" />
<!-- <driver name="EcalReadout"/>
<driver name="EcalConverter"/>
@@ -25,10 +24,6 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</runNumber>
- </driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim Sat Jan 3 18:05:58 2015
@@ -3,8 +3,6 @@
<inputFiles>
<!--<fileRegExp baseDir="./../data/mc/HPS-TestRun-v5/1.8-SNAPSHOT-recoil-101013/">egs_5.5gev_0.016x0_500mb_recoil_readout_[0-9].slcio</fileRegExp>-->
<fileRegExp baseDir="./../data/testrun/mc/HPS-TestRun-v7/">egs_5.5gev_0.016x0_500mb_90na_readout_\d\d.slcio</fileRegExp>
-
-
</inputFiles>
<control>
<numberOfEvents>1000000000</numberOfEvents>
@@ -13,7 +11,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
@@ -61,19 +58,6 @@
</driver>
<driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
<driver name="PrintGeometryDriver" type="org.hps.analysis.examples.PrintGeometryDriver"/>
-
-
-
-
-
-
-
-
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</runNumber>
- <!-- <gainFilename>default_goodregion_shift_v1.gain</gainFilename> -->
- </driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
