Author: [log in to unmask]
Date: Fri Oct 31 17:55:11 2014
New Revision: 1374
Log:
Fix up steering files to use new conditions system. HPSJAVA-273
Modified:
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim Fri Oct 31 17:55:11 2014
@@ -25,7 +25,7 @@
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
+ <eventInterval>1000</eventInterval>
</driver>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim Fri Oct 31 17:55:11 2014
@@ -8,8 +8,9 @@
<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="EventMarkerDriver"/>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -24,9 +25,8 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>${runNumber}</runNumber>-->
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim Fri Oct 31 17:55:11 2014
@@ -8,7 +8,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver" />
+ <driver name="SvtSensorSetup" />
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -23,9 +24,8 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>${runNumber}</runNumber>-->
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim Fri Oct 31 17:55:11 2014
@@ -9,10 +9,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
-
- <driver name="ConditionsDriver"/>
-
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver" />
+ <driver name="SvtSensorSetup" />
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -27,12 +25,8 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>${runNumber}</runNumber>-->
- </driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim Fri Oct 31 17:55:11 2014
@@ -9,7 +9,8 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver" />
+ <driver name="SvtSensorSetup" />
<driver name="RawTrackerHitSensorSetup"/>
<driver name="SVTBadChannelFilterDriver"/>
<driver name="RawTrackerHitFitterDriver" />
@@ -21,6 +22,8 @@
</execute>
<drivers>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="SVTBadChannelFilterDriver" type="org.hps.recon.tracking.SVTBadChannelFilterDriver"/>
<driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/SimpleMCRecon.lcsim Fri Oct 31 17:55:11 2014
@@ -15,8 +15,10 @@
<execute>
<!-- Print out event numbers. -->
<driver name="EventMarkerDriver"/>
- <!-- Load the text based conditions. -->
- <driver name="CalibrationDriver"/>
+ <!-- Load the database detector conditions. -->
+ <driver name="ConditionsDriver"/>
+ <!-- Setup the SVT sensors. -->
+ <driver name="SvtSensorSetup" />
<!-- Simple tracker hit digi. -->
<driver name="TrackerDigiDriver"/>
<!-- Create tracker hits. -->
@@ -36,7 +38,8 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>10</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
<debug>false</debug>
</driver>
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim Fri Oct 31 17:55:11 2014
@@ -7,10 +7,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
-
<driver name="ConditionsDriver"/>
-
- <driver name="CalibrationDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="RawTrackerHitSensorSetup"/>
<driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
@@ -25,12 +23,8 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>${runNumber}</runNumber>
- </driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
Modified: java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim
=============================================================================
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim (original)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim Fri Oct 31 17:55:11 2014
@@ -2,7 +2,8 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver" />
+ <driver name="SvtSensorSetup" />
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -15,9 +16,8 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>${runNumber}</runNumber>-->
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
