Author: [log in to unmask]
Date: Wed Apr 22 06:44:48 2015
New Revision: 2781
Log:
remove prescales from trigger; add conditions driver to the "HPS2014XXX" drivers
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim
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/EngineeringRun2014PresTrigPairs0.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim Wed Apr 22 06:44:48 2015
@@ -23,11 +23,11 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
- <runNumber>3422</runNumber>
- <freeze>true</freeze>
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+ <detectorName>HPS-ECalCommissioning-v3</detectorName>
+ <runNumber>3422</runNumber>
+ <freeze>true</freeze>
+ </driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
<rejectBackground>false</rejectBackground>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim Wed Apr 22 06:44:48 2015
@@ -24,9 +24,9 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
- <runNumber>3422</runNumber>
- <freeze>true</freeze>
+ <detectorName>HPS-ECalCommissioning-v3</detectorName>
+ <runNumber>3422</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/EngineeringRun2014PresTrigSingles0.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim Wed Apr 22 06:44:48 2015
@@ -24,7 +24,7 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
+ <detectorName>HPS-ECalCommissioning-v3</detectorName>
<runNumber>3422</runNumber>
<freeze>true</freeze>
</driver>
@@ -66,7 +66,7 @@
<seedEnergyLowThreshold>0.1</seedEnergyLowThreshold>
<clusterEnergyLowThreshold>0.5</clusterEnergyLowThreshold>
<clusterEnergyHighThreshold>2.5</clusterEnergyHighThreshold>
- <prescale>256</prescale>
+ <prescale>1</prescale>
<outputFileName>${outputFile}.triggers.singles0</outputFileName>
<!--<verbose>true</verbose>-->
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim Wed Apr 22 06:44:48 2015
@@ -24,7 +24,7 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
+ <detectorName>HPS-ECalCommissioning-v3</detectorName>
<runNumber>3422</runNumber>
<freeze>true</freeze>
</driver>
@@ -66,7 +66,7 @@
<seedEnergyLowThreshold>0.1</seedEnergyLowThreshold>
<clusterEnergyLowThreshold>1.0</clusterEnergyLowThreshold>
<clusterEnergyHighThreshold>2.5</clusterEnergyHighThreshold>
- <prescale>128</prescale>
+ <prescale>1</prescale>
<outputFileName>${outputFile}.triggers.singles1</outputFileName>
<!--<verbose>true</verbose>-->
</driver>
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 Wed Apr 22 06:44:48 2015
@@ -25,8 +25,8 @@
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <runNumber>3422</runNumber>
- <detectorName>HPS-EngRun2015-Nominal-v0</detectorName>
+ <runNumber>4888</runNumber>
+ <detectorName>HPS-Proposal2014-v6-2pt2</detectorName>
<freeze>true</freeze>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
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 Wed Apr 22 06:44:48 2015
@@ -9,7 +9,8 @@
<printDriversDetailed>false</printDriversDetailed>
</control>
<execute>
- <driver name="EventMarkerDriver"/>
+ <driver name="EventMarkerDriver"/>
+ <driver name="ConditionsDriver"/>
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClusterer"/>
@@ -23,6 +24,11 @@
<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>
<driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
<evioOutputFile>${outputFile}.evio</evioOutputFile>
</driver>
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 Wed Apr 22 06:44:48 2015
@@ -9,6 +9,7 @@
</control>
<execute>
<driver name="EventMarkerDriver" />
+ <driver name="ConditionsDriver"/>
<driver name="EcalReadout" />
<driver name="EcalConverter" />
<driver name="EcalClusterer" />
@@ -23,6 +24,11 @@
<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>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
</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 Apr 22 06:44:48 2015
@@ -11,6 +11,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
+ <driver name="ConditionsDriver"/>
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClusterer"/>
@@ -25,6 +26,11 @@
<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>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
<rejectBackground>true</rejectBackground>
