Author: [log in to unmask] Date: Wed Apr 22 06:50:41 2015 New Revision: 2782 Log: Add conditions; remove Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim Wed Apr 22 06:50:41 2015 @@ -26,7 +26,7 @@ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver"> <detectorName>HPS-EngRun2015-Nominal-v0</detectorName> - <runNumber>3422</runNumber> + <runNumber>4888</runNumber> <freeze>true</freeze> </driver> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim Wed Apr 22 06:50:41 2015 @@ -5,8 +5,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="RawTrackerHitSensorSetup"/> + <driver name="EventMarkerDriver"/> <driver name="RawTrackerHitFitterDriver" /> <driver name="TrackerHitDriver"/> <driver name="HelicalTrackHitDriver"/> @@ -22,8 +21,7 @@ <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1000</eventInterval> - </driver> - <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/> + </driver> <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <fitAlgorithm>Pileup</fitAlgorithm> <useTimestamps>false</useTimestamps> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim Wed Apr 22 06:50:41 2015 @@ -7,7 +7,7 @@ xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <execute> <driver name="EventMarkerDriver"/> - <driver name="RawTrackerHitSensorSetup"/> + <driver name="ConditionsDriver"/> <driver name="RawTrackerHitFitterDriver" /> <driver name="TrackerHitDriver"/> <driver name="HelicalTrackHitDriver"/> @@ -23,7 +23,12 @@ <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1000</eventInterval> - </driver> + </driver> + <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver"> + <detectorName>HPS-EngRun2015-Nominal-v0</detectorName> + <runNumber>4888</runNumber> + <freeze>true</freeze> + </driver> <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/> <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <fitAlgorithm>Pileup</fitAlgorithm> 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 Apr 22 06:50:41 2015 @@ -6,8 +6,7 @@ </control> <execute> <driver name="EventMarkerDriver"/> - <driver name="RawTrackerHitSensorSetup"/> - <driver name="SVTBadChannelFilterDriver"/> + <driver name="ConditionsDriver"/> <driver name="RawTrackerHitFitterDriver" /> <driver name="TrackerHitDriver" /> <driver name="HelicalTrackHitDriver" /> @@ -18,6 +17,11 @@ <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1000</eventInterval> + </driver> + <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver"> + <detectorName>HPS-EngRun2015-Nominal-v0</detectorName> + <runNumber>4888</runNumber> + <freeze>true</freeze> </driver> <driver name="SVTBadChannelFilterDriver" type="org.hps.recon.tracking.SVTBadChannelFilterDriver"/> <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>