Print

Print


Author: [log in to unmask]
Date: Tue Apr 28 19:35:20 2015
New Revision: 2850

Log:
add command line variables for conditions driver:  run & detector

Modified:
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim	Tue Apr 28 19:35:20 2015
@@ -21,13 +21,10 @@
         <driver name="CleanupDriver"/>
     </execute>    
     <drivers>
-
-
-
-   <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
-     <runNumber>4888</runNumber>
-      <detectorName>HPS-Proposal2014-v6-2pt2</detectorName>
-     <freeze>true</freeze> 
+  <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+         <detectorName>${detector}</detectorName>
+          <runNumber>${run}</runNumber>
+        <freeze>true</freeze>
     </driver>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	Tue Apr 28 19:35:20 2015
@@ -25,9 +25,9 @@
             <eventInterval>1000</eventInterval>
         </driver> 
    <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
-     <runNumber>4888</runNumber>
-      <detectorName>HPS-Proposal2014-v6-2pt2</detectorName>
-     <freeze>true</freeze> 
+         <detectorName>${detector}</detectorName>
+          <runNumber>${run}</runNumber>
+        <freeze>true</freeze>
     </driver>
         <driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
             <evioOutputFile>${outputFile}.evio</evioOutputFile>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim	Tue Apr 28 19:35:20 2015
@@ -25,9 +25,9 @@
             <eventInterval>1000</eventInterval>
         </driver>
    <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
-     <runNumber>4888</runNumber>
-      <detectorName>HPS-Proposal2014-v6-2pt2</detectorName>
-     <freeze>true</freeze> 
+         <detectorName>${detector}</detectorName>
+          <runNumber>${run}</runNumber>
+        <freeze>true</freeze>
     </driver>
         <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
             <outputFile>${outputFile}.slcio</outputFile>

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	Tue Apr 28 19:35:20 2015
@@ -26,10 +26,10 @@
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>
         </driver> 
-        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
-     <runNumber>4888</runNumber>
-      <detectorName>HPS-Proposal2014-v6-2pt2</detectorName>
-     <freeze>true</freeze> 
+       <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+         <detectorName>${detector}</detectorName>
+          <runNumber>${run}</runNumber>
+        <freeze>true</freeze>
     </driver>
         <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
             <outputFile>${outputFile}.slcio</outputFile>