9 modified files
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -1,17 +1,17 @@
<!--
Execute trigger+readout simulation without pileup (event by event) and write the results as an LCIO file.
@author Sho Uemura <[log in to unmask]>
- @version $Id: HPS2014ReadoutNoPileup.lcsim,v 1.4 2013/08/07 23:37:30 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
- <printInputFiles>true</printInputFiles>
- <printDriversDetailed>true</printDriversDetailed>
+ <printInputFiles>false</printInputFiles>
+ <printDriversDetailed>false</printDriversDetailed>
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver" />
+ <driver name="SvtSensorSetup" />
<driver name="EcalEdepToTriggerConverterDriver"/>
<driver name="EcalReadoutConverterDriver"/>
<driver name="EcalTriggerClusterer"/>
@@ -24,8 +24,8 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EcalEdepToTriggerConverterDriver" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
<applyBadCrystalMap>false</applyBadCrystalMap>
@@ -50,7 +50,6 @@
<pairCoincidence>0</pairCoincidence>
<lcioFile>${outputFile}.slcio</lcioFile>
</driver>
-
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
<noPileup>true</noPileup>
</driver>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -1,45 +1,38 @@
<!--
Execute full trigger+readout simulation and write the results as an EVIO file.
@author Sho Uemura <[log in to unmask]>
- @version $Id: HPS2014ReadoutToEvio.lcsim,v 1.2 2013/03/01 23:22:24 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+ <control>
+ <printInputFiles>false</printInputFiles>
+ <printDriversDetailed>false</printDriversDetailed>
+ </control>
<execute>
<driver name="EventMarkerDriver"/>
-
<driver name="ConditionsDriver"/>
-
- <driver name="CalibrationDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalTrigger"/>
-
<driver name="SimpleSVTReadout"/>
-
<driver name="TestRunReconToEvio"/>
-
- <!--<driver name="AidaSaveDriver"/>-->
-
<driver name="ClockDriver"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
<loadSvtConditions>false</loadSvtConditions>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <runNumber>1351</runNumber>
- </driver>
<driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
<evioOutputFile>${outputFile}.evio</evioOutputFile>
</driver>
-
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>1</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -49,7 +42,6 @@
<!-- <fixedGain>0.15</fixedGain>-->
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
@@ -58,27 +50,18 @@
<use2014Gain>true</use2014Gain>
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>1</clusterWindow>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
-
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<pairCoincidence>2</pairCoincidence>
<outputFileName>${outputFile}.triggers</outputFileName>
</driver>
- <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
- </driver>
-
- <!-- <driver name="AidaSaveDriver"
- type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${outputFile}_triggerPlots</outputFileName>
- </driver>-->
-
+ <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout" />
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -1,25 +1,24 @@
<!--
Execute full trigger+readout simulation and write the results as an LCIO file.
@author Sho Uemura <[log in to unmask]>
- @version $Id: HPS2014ReadoutToLcio.lcsim,v 1.2 2013/03/01 23:22:24 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+ <control>
+ <printInputFiles>false</printInputFiles>
+ <printDriversDetailed>false</printDriversDetailed>
+ </control>
<execute>
<driver name="EventMarkerDriver"/>
-
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalTrigger"/>
-
<driver name="SimpleSVTReadout"/>
-
<driver name="TestRunReconToLcio"/>
-
<driver name="AidaSaveDriver"/>
-
<driver name="ClockDriver"/>
<driver name="CleanupDriver"/>
</execute>
@@ -28,13 +27,11 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
</driver>
-
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>1</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -44,7 +41,6 @@
<!-- <fixedGain>0.15</fixedGain>-->
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
@@ -53,27 +49,22 @@
<use2014Gain>true</use2014Gain>
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>1</clusterWindow>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
-
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<pairCoincidence>2</pairCoincidence>
<outputFileName>${outputFile}.triggers</outputFileName>
</driver>
- <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
- </driver>
-
+ <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout" />
<driver name="AidaSaveDriver"
type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}_triggerPlots</outputFileName>
</driver>
-
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -5,23 +5,21 @@
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+ <control>
+ <printInputFiles>false</printInputFiles>
+ <printDriversDetailed>false</printDriversDetailed>
+ </control>
<execute>
<driver name="EventMarkerDriver"/>
-
<driver name="ConditionsDriver"/>
-
- <driver name="CalibrationDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalTrigger"/>
-
<driver name="SimpleSVTReadout"/>
-
<driver name="TestRunReconToLcio"/>
-
<driver name="AidaSaveDriver"/>
-
<driver name="ClockDriver"/>
<driver name="CleanupDriver"/>
</execute>
@@ -30,17 +28,12 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
- <!-- <runNumber>1351</runNumber> -->
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
<rejectBackground>true</rejectBackground>
</driver>
-
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>1</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -50,7 +43,6 @@
<!-- <fixedGain>0.15</fixedGain>-->
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
@@ -59,13 +51,11 @@
<use2014Gain>true</use2014Gain>
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>1</clusterWindow>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
-
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
@@ -74,12 +64,10 @@
</driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
</driver>
-
<driver name="AidaSaveDriver"
type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}_triggerPlots</outputFileName>
</driver>
-
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPSTrackingDefaults.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/HPSTrackingDefaults.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -1,53 +1,40 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
<control>
- <printInputFiles>true</printInputFiles>
- <printDriversDetailed>true</printDriversDetailed>
+ <printInputFiles>false</printInputFiles>
+ <printDriversDetailed>false</printDriversDetailed>
</control>
-
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="TrackerDigiDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
<driver name="LCIOWriter"/>
</execute>
-
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
- </driver>
-
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
-
+ <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">
<!-- <dropBadChannels>true</dropBadChannels>-->
<debug>false</debug>
</driver>
-
- <driver name="HelicalTrackHitDriver"
- type="org.hps.recon.tracking.HelicalTrackHitDriver">
+ <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
-
- <driver name="TrackerReconDriver"
- type="org.hps.recon.tracking.TrackerReconDriver">
+ <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+ <strategyResource>HPS-Full.xml</strategyResource>
</driver>
-
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}</outputFilePath>
</driver>
-
</drivers>
</lcsim>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/LcioToEvio.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/LcioToEvio.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -4,16 +4,18 @@
<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="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
+ <driver name="ConditionsDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="DummyTrigger"/>
<driver name="TestRunReconToEvio"/>
<driver name="ClockDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="DummyTrigger" type="org.hps.readout.ecal.DummyTriggerDriver">
<period>1</period>
<deadTime>0</deadTime>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -1,4 +1,3 @@
-
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
@@ -7,7 +6,8 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="CalibrationDriver"/>
+ <driver name="ConditionsDriver"/>
+ <driver name="SvtSensorSetup" />
<driver name="EcalRawConverter"/>
<driver name="EcalRawConverterDriver"/>
<driver name="EcalTriggerFilter"/>
@@ -18,8 +18,11 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>1000</eventInterval>
</driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
</driver>
@@ -37,18 +40,14 @@
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
</driver>
+ <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
+ <noPileup>true</noPileup>
+ </driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
<deadTime>0</deadTime>
<lcioFile>${outputFile}.slcio</lcioFile>
</driver>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1000</eventInterval>
- </driver>
-
- <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
- <noPileup>true</noPileup>
- </driver>
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers>
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -5,7 +5,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="BadChannelFilter" />
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
@@ -17,17 +18,12 @@
<driver name="TestRunReconToEvio"/>
<driver name="CleanupDriver"/>
</execute>
-
<drivers>
<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="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
- <evioOutputFile>${outputFile}.evio</evioOutputFile>
- </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>8</coincidenceWindow>
@@ -43,36 +39,32 @@
<pulseShape>CRRC</pulseShape>
<tp>14.0</tp>
</driver>
-
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<scale>1</scale>
</driver>
-
<driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalCorrectedHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
-
<driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>32.0</clusterWindow>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
</driver>
-
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<outputFileName>${outputFile}.triggers</outputFileName>
</driver>
- <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
- </driver>
-
+ <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout" />
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ <driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
+ <evioOutputFile>${outputFile}.evio</evioOutputFile>
+ </driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
</drivers>
</lcsim>
-
java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout
--- java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim 2014-10-20 21:46:56 UTC (rev 1253)
+++ java/branches/hps_java_trunk_HPSJAVA-255/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim 2014-10-21 06:30:22 UTC (rev 1254)
@@ -5,7 +5,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="BadChannelFilter" />
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
@@ -22,12 +23,8 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <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>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>8</coincidenceWindow>
@@ -43,24 +40,20 @@
<pulseShape>CRRC</pulseShape>
<tp>14.0</tp>
</driver>
-
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<scale>1</scale>
</driver>
-
<driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalCorrectedHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
-
<driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>32.0</clusterWindow>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
</driver>
-
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
@@ -68,11 +61,12 @@
</driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
</driver>
-
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
+ <outputFile>${outputFile}.slcio</outputFile>
+ </driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
</drivers>
</lcsim>
-
SVNspam 0.1
