Author: [log in to unmask]
Date: Thu Jan 15 15:47:16 2015
New Revision: 1937
Log:
Fix up steering files.
Removed:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/HPS2014OfflineRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/MockReconClusterICTest.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MultScatAna.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.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
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim
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/TestRunOfflineReconTwoTrkFilter.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/SimpleTestRunReadoutToLcio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/spaul/HitrateHistograms.lcsim
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim Thu Jan 15 15:47:16 2015
@@ -1,24 +1,21 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalMonitoringPlots"/>
- </execute>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalMonitoringPlots" />
+ </execute>
<drivers>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<applyBadCrystalMap>false</applyBadCrystalMap>
<use2014Gain>false</use2014Gain>
- </driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.BasicMonitoringPlotsDriver"/>
+ </driver>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
+ </driver>
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.BasicMonitoringPlotsDriver" />
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim Thu Jan 15 15:47:16 2015
@@ -19,9 +19,8 @@
<applyBadCrystalMap>false</applyBadCrystalMap>
<use2014Gain>false</use2014Gain>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
<driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
<inputCollection>EcalCalHits</inputCollection>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim Thu Jan 15 15:47:16 2015
@@ -13,9 +13,8 @@
<!-- <driver name="EcalMonitoringPlots"/>-->
<!-- <driver name="EcalHitPlots"/>-->
<!-- <driver name="EcalClusterPlots"/>-->
- <driver name="TriggerPlots"/>
+<!-- <driver name="TriggerPlots"/> -->
<!--
- <driver name="EcalEventMonitor"/>
<driver name="EcalEvsX"/>
<driver name="EcalWindowPlots"/>
<driver name="EcalDaqPlots"/>
@@ -35,40 +34,41 @@
<inputCollection>EcalCalHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
- <eventRefreshRate>1</eventRefreshRate>
- </driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
<eventRefreshRate>1</eventRefreshRate>
</driver>
<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>-->
- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
+<!--
+ <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.plots.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<maxE>10000</maxE>
<eventRefreshRate>100</eventRefreshRate>
</driver>
+-->
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <clusterWindow>32.0</clusterWindow>
- <ecalCollectionName>EcalFilteredHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalFilteredHits</inputHitCollectionName>
+ <cuts>0 32.0</cuts>
</driver>
- <driver name="EcalHitPlots" type="org.hps.monitoring.drivers.ecal.EcalHitPlots">
+ <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
</driver>
- <driver name="EcalClusterPlots" type="org.hps.monitoring.drivers.ecal.EcalClusterPlots">
+ <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
</driver>
- <driver name="TriggerPlots" type="org.hps.monitoring.drivers.ecal.TriggerPlots">
+<!--
+ <driver name="TriggerPlots" type="org.hps.monitoring.ecal.plots.TriggerPlots">
<clusterEnergyCut>1280</clusterEnergyCut>
<eventRefreshRate>10000</eventRefreshRate>
</driver>
+ -->
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>triggerPlots</outputFileName>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim Thu Jan 15 15:47:16 2015
@@ -1,28 +1,25 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
- <driver name="FADCConverter"/>
- <driver name="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalIntegralPedestalPlots"/>
- <driver name="EcalMonitoringPlots"/>
- <driver name="EcalHitPlots"/>
- <driver name="EcalClusterPlots"/>
- <driver name="EcalWindowEventPlots"/>
- <driver name="EcalEventMonitor"/>
+ <driver name="EventMarkerDriver" />
+ <driver name="FADCConverter" />
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <!-- <driver name="EcalIntegralPedestalPlots" /> -->
+ <driver name="EcalMonitoringPlots" />
+ <driver name="EcalHitPlots" />
+ <driver name="EcalClusterPlots" />
+ <driver name="EcalWindowEventPlots" />
<!--
<driver name="EcalPedestalPlots"/>
- <driver name="EcalEvsX"/>
<driver name="EcalWindowPlots"/>
<driver name="EcalDaqPlots"/>
-->
- </execute>
+ </execute>
<drivers>
<driver name="FADCConverter" type="org.hps.recon.ecal.FADCConverterDriver">
<threshold>80</threshold>
@@ -33,47 +30,40 @@
<gain>1.0</gain>
<use2014Gain>false</use2014Gain>
</driver>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
<inputCollection>EcalIntegralHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
- <eventRefreshRate>1</eventRefreshRate>
- </driver>
- <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.EcalWindowPlotsXY">
+ <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.plots.EcalWindowPlotsXY">
<subdetectorName>Ecal</subdetectorName>
<inputCollection>EcalReadoutHits</inputCollection>
<window>100</window>
</driver>
- <driver name="EcalWindowEventPlots" type="org.hps.monitoring.drivers.ecal.EcalWindowEventPlots">
+ <driver name="EcalWindowEventPlots" type="org.hps.monitoring.ecal.plots.EcalWindowEventPlots">
<inputCollection>EcalReadoutHits</inputCollection>
<window>100</window>
</driver>
-<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
+<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.plots.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>-->
- <driver name="EcalIntegralPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
+<!--
+ <driver name="EcalIntegralPedestalPlots" type="org.hps.monitoring.ecal.plots.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+-->
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalClusterer"
- type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
</driver>
- <driver name="EcalClusterPlots" type="org.hps.monitoring.drivers.ecal.EcalClusterPlots">
+ <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
</driver>
- <driver name="EcalHitPlots" type="org.hps.monitoring.drivers.ecal.EcalHitPlots">
- </driver>
- <driver name="EcalEvsX" type="org.hps.monitoring.drivers.ecal.EcalEvsX">
- <inputCollection>EcalClusters</inputCollection>
+ <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim Thu Jan 15 15:47:16 2015
@@ -1,20 +1,19 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
- <numberOfEvents>-1</numberOfEvents>
+ <numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
- </control>
+ </control>
<execute>
<!-- <driver name="EventMarkerDriver"/> -->
- <driver name="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalMonitoringPlots"/> <!-- General plots -->
- <driver name="EcalHitPlots"/> <!-- Single hit distributions -->
- <driver name="EcalClusterPlots"/> <!-- Clusters distributions -->
- <driver name="EcalDaqPlots"/> <!-- DAQ Plots -->
- <driver name="EcalEventDisplay"/> <!-- Ecal event display -->
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalMonitoringPlots" /> <!-- General plots -->
+ <driver name="EcalHitPlots" /> <!-- Single hit distributions -->
+ <driver name="EcalClusterPlots" /> <!-- Clusters distributions -->
+ <driver name="EcalDaqPlots" /> <!-- DAQ Plots -->
+ <driver name="EcalEventDisplay" /> <!-- Ecal event display -->
<!-- <driver name="EcalWindowPlots"/> -->
<!-- <driver name="EcalEvsX"/> -->
@@ -28,40 +27,38 @@
<!-- Here starts the drivers description -->
<drivers>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<!-- <threshold>150</threshold>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
- <use2014Gain>false</use2014Gain>
+ <use2014Gain>false</use2014Gain>
<!-- <dropBadFADC>true</dropBadFADC>-->
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
-<!-- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterIC"> -->
-<!-- <clusterWindow>32.0</clusterWindow>-->
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <addEMin>0.010</addEMin>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
+ <!-- <addEMin>0.010</addEMin> -->
+ <cuts>0.010</cuts>
</driver>
<driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
- <inputCollection>EcalCalHits</inputCollection>
+ <inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>5</eventRefreshRate>
<accumulateHits>false</accumulateHits>
</driver>
<driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
- <inputCollection>EcalCalHits</inputCollection>
+ <inputCollection>EcalCalHits</inputCollection>
<maxE>2.0</maxE>
- <logScale>false</logScale>
+ <logScale>false</logScale>
</driver>
<driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
<maxE>2.0</maxE>
<logScale>false</logScale>
</driver>
<driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
- <inputCollection>EcalCalHits</inputCollection>
+ <inputCollection>EcalCalHits</inputCollection>
</driver>
- <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
+ <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
<inputCollection>EcalCalHits</inputCollection>
<inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
<inputClusterCollection>EcalClusters</inputClusterCollection>
@@ -91,4 +88,4 @@
<outputFileName>triggerEPlots</outputFileName>
</driver> -->
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim Thu Jan 15 15:47:16 2015
@@ -1,13 +1,15 @@
<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="EventMarkerDriver"/> -->
<driver name="EcalMonitoringTestDriver"/>
</execute>
<drivers>
+<!--
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
+-->
<driver name="EcalMonitoringTestDriver" type="org.hps.monitoring.drivers.example.EcalMonitoringTestDriver"/>
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim Thu Jan 15 15:47:16 2015
@@ -1,125 +1,93 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>false</printInputFiles>
<printDriversDetailed>false</printDriversDetailed>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
- <driver name="SVTSetupDriver"/>
- <driver name="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="SVTOccupancyPlots"/>
- <driver name="SVTEventPlots"/>
- <driver name="SVTPulsePlots"/>
- <driver name="RawTrackerHitFitterDriver"/>
- <driver name="TrackerHitDriver"/>
- <driver name="SVTHitRecoPlots"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="TrackingReconstructionPlots"/>
-<!-- <driver name="SVTHitCorrPlots"/> -->
-<!-- <driver name="LCIOWriter"/> -->
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="SVTOccupancyPlots" />
+ <driver name="SVTEventPlots" />
+ <driver name="SVTPulsePlots" />
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver" />
+ <driver name="SVTHitRecoPlots" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
+ <driver name="TrackingReconstructionPlots" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>false</use2014Gain>
- </driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
-
- <driver name="RawTrackerHitFitterDriver"
- type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
- <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
- <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
- <fitAlgorithm>Analytic</fitAlgorithm>
</driver>
-
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
+ </driver>
+ <driver name="RawTrackerHitFitterDriver"
+ type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
+ <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
+ <fitAlgorithm>Analytic</fitAlgorithm>
+ </driver>
<driver name="TrackerHitDriver"
- type="org.hps.recon.tracking.DataTrackerHitDriver">
- <clusterSeedThreshold>3.0</clusterSeedThreshold>
- <clusterNeighborThreshold>3.0</clusterNeighborThreshold>
- <clusterThreshold>3.0</clusterThreshold>
+ type="org.hps.recon.tracking.DataTrackerHitDriver">
+ <clusterSeedThreshold>3.0</clusterSeedThreshold>
+ <clusterNeighborThreshold>3.0</clusterNeighborThreshold>
+ <clusterThreshold>3.0</clusterThreshold>
</driver>
-
- <driver name="SVTEventPlots"
- type="org.hps.monitoring.drivers.svt.SVTEventInfo">
- <outputPlots>svtEventInfoPlots.aida</outputPlots>
+ <driver name="SVTEventPlots"
+ type="org.hps.monitoring.drivers.svt.SVTEventInfo">
+ <outputPlots>svtEventInfoPlots.aida</outputPlots>
</driver>
-
<driver name="SVTHitRecoPlots"
- type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
- <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
- <outputPlots>svtHitRecoPlots.aida</outputPlots>
+ type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
+ <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
+ <outputPlots>svtHitRecoPlots.aida</outputPlots>
</driver>
-
<driver name="SVTHitCorrPlots"
- type="org.hps.monitoring.drivers.svt.SVTHitRecoCorrelations">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
- <outputPlots>svtHitRecoCorrPlots.aida</outputPlots>
+ type="org.hps.monitoring.drivers.svt.SVTHitRecoCorrelations">
+ <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+ <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
+ <outputPlots>svtHitRecoCorrPlots.aida</outputPlots>
</driver>
-
<driver name="SVTPulsePlots"
- type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- <outputPlots>svtPulsePlots.aida</outputPlots>
- </driver>
- <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
+ type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
+ <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+ <outputPlots>svtPulsePlots.aida</outputPlots>
+ </driver>
+ <driver name="SVTOccupancyPlots"
+ type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<eventRefreshRate>100</eventRefreshRate>
</driver>
-
<driver name="SVTEventDisplay"
- type="org.hps.monitoring.drivers.svt.SVTEventDisplay">
- </driver>
-
- <driver name="SVTSetupDriver"
- type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
- </driver>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ type="org.hps.monitoring.drivers.svt.SVTEventDisplay">
+ </driver>
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
-
<driver name="HelicalTrackHitDriver"
- type="org.hps.recon.tracking.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">
- <debug>false</debug>
+ <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+ <debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- </driver>
-
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
- <outputPlots>trackingPlots.aida</outputPlots>
</driver>
-
-
- <driver name="LCIOWriter"
- type="org.hps.users.mgraham.MyLCIOWriterDriver">
- <outputFilePath>/Users/mgraham/HPS/trackRecon.slcio</outputFilePath>
+ <driver name="TrackingReconstructionPlots"
+ type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
+ <outputPlots>trackingPlots.aida</outputPlots>
</driver>
-
-<!--
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>/Users/mgraham/HPS/trackRecon.slcio</outputFilePath>
+ <driver name="CleanupDriver"
+ type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+ <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits StripClusterer_SiTrackerHitStrip1D</collectionNames>
</driver>
--->
- <driver name="CleanupDriver"
- type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
- <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits StripClusterer_SiTrackerHitStrip1D</collectionNames>
- </driver>
-
- </drivers>
+ </drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim Thu Jan 15 15:47:16 2015
@@ -12,30 +12,29 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver"/>
- <driver name="CleanupDriver"
- type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"/>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="HelicalTrackHitDriver" type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver">
- <debug>false</debug>
+ <!-- This Driver probably needs to be replaced with one specific to HPS. JM -->
+ <driver name="HelicalTrackHitDriver" type="org.lcsim.fit.helicaltrack.HelicalTrackHitDriver">
+ <!-- <debug>false</debug> -->
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
- <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
+ <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
<driver name="SVTBasicMonitoringPlots" type="org.hps.monitoring.drivers.svt.BasicMonitoringPlotsDriver">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim Thu Jan 15 15:47:16 2015
@@ -1,57 +1,49 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
- <driver name="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="RawTrackerHitFitterDriver"/>
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="SVTSimpleEventDisplay"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
+ <driver name="SVTSimpleEventDisplay" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
- <driver name="EcalRawConverter"
- type="org.hps.recon.ecal.EcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>false</use2014Gain>
</driver>
- <driver name="EcalClusterer"
- type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="RawTrackerHitFitterDriver"
- type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"/>
- <driver name="CleanupDriver"
- type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</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>
- </driver>
+ </driver>
<driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<inputCollection>SVTRawTrackerHits</inputCollection>
<singleEvent>false</singleEvent>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim Thu Jan 15 15:47:16 2015
@@ -32,9 +32,8 @@
<ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>false</use2014Gain>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim Thu Jan 15 15:47:16 2015
@@ -2,14 +2,12 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="SVTSetupDriver"/>
<driver name="SVTOccupancyPlots"/>
</execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="SVTSetupDriver" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
<driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<eventRefreshRate>1</eventRefreshRate>
</driver>
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 Thu Jan 15 15:47:16 2015
@@ -45,10 +45,9 @@
<use2014Gain>true</use2014Gain>
<!-- <debug>true</debug>-->
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
- <ecalName>Ecal</ecalName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
+ <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
<clusterWindow>1</clusterWindow>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
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 Thu Jan 15 15:47:16 2015
@@ -2,30 +2,28 @@
Execute full trigger+readout simulation and write the results as an LCIO file.
@author Sho Uemura <[log in to unmask]>
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
+ <driver name="EventMarkerDriver" />
<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>
-
+ <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>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
+ </driver>
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
@@ -46,26 +44,24 @@
<applyBadCrystalMap>false</applyBadCrystalMap>
<use2014Gain>true</use2014Gain>
<!-- <debug>true</debug> -->
- </driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
- <ecalName>Ecal</ecalName>
+ </driver>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
<clusterWindow>1</clusterWindow>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<pairCoincidence>2</pairCoincidence>
<outputFileName>${outputFile}.triggers</outputFileName>
- </driver>
+ </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="ClockDriver" type="org.hps.readout.ecal.ClockDriver" />
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
- </driver>
+ </driver>
</drivers>
-</lcsim>
-
+</lcsim>
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 Thu Jan 15 15:47:16 2015
@@ -48,10 +48,9 @@
<use2014Gain>true</use2014Gain>
<!-- <debug>true</debug>-->
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
- <ecalName>Ecal</ecalName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
+ <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
<clusterWindow>1</clusterWindow>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim Thu Jan 15 15:47:16 2015
@@ -33,10 +33,10 @@
<inputCollection>EcalTriggerHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
- <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalFilteredHits</ecalCollectionName>
- <clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
+ <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalFilteredHits</inputHitCollectionName>
+ <outputClusterCollectionName>EcalTriggerClusters</outputClusterCollectionName>
</driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
<noPileup>true</noPileup>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim Thu Jan 15 15:47:16 2015
@@ -46,8 +46,11 @@
<inputCollection>EcalCorrectedHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.CTPClusterDriver">
- <clusterWindow>32.0</clusterWindow>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <!-- addEMin clusterWindow -->
+ <cuts>0 32.0</cuts>
+ <!-- <clusterWindow>32.0</clusterWindow> -->
<inputHitCollectionName>EcalFilteredHits</inputHitCollectionName>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim Thu Jan 15 15:47:16 2015
@@ -1,28 +1,27 @@
<!--
Execute test run full recon and write the results as an LCIO file.
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="EventMarkerDriver" />
<driver name="SvtSensorSetup" />
<driver name="BadChannelFilter" />
- <driver name="EcalReadout"/>
- <driver name="EcalConverter"/>
- <driver name="EcalTriggerFilter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalTrigger"/>
- <driver name="SimpleSVTReadout"/>
- <driver name="ClockDriver"/>
- <driver name="TestRunReconToLcio"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="EcalReadout" />
+ <driver name="EcalConverter" />
+ <driver name="EcalTriggerFilter" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalTrigger" />
+ <driver name="SimpleSVTReadout" />
+ <driver name="ClockDriver" />
+ <driver name="TestRunReconToLcio" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
+ </driver>
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>8</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -41,29 +40,31 @@
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<scale>1</scale>
- </driver>
+ </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 name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalFilteredHits</inputHitCollectionName>
+ <!-- <clusterWindow>32.0</clusterWindow> -->
+ <!-- addEMin clusterWindow -->
+ <cuts>0.0 32.0</cuts>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<outputFileName>${outputFile}.triggers</outputFileName>
- </driver>
+ </driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
</driver>
- <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ <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>
+ </driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim Thu Jan 15 15:47:16 2015
@@ -1,25 +1,24 @@
<!--
Execute test run full recon and write the results as an LCIO file.
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="ConditionsDriver"/>
-->
- <driver name="EventMarkerDriver"/>
+ <driver name="EventMarkerDriver" />
<driver name="SvtSensorSetup" />
<driver name="BadChannelFilter" />
- <driver name="EcalReadout"/>
- <driver name="EcalConverter"/>
- <driver name="EcalTriggerFilter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalTrigger"/>
- <driver name="SimpleSVTReadout"/>
- <driver name="ClockDriver"/>
- <driver name="TestRunReconToLcio"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="EcalReadout" />
+ <driver name="EcalConverter" />
+ <driver name="EcalTriggerFilter" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalTrigger" />
+ <driver name="SimpleSVTReadout" />
+ <driver name="ClockDriver" />
+ <driver name="TestRunReconToLcio" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
<!--
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
@@ -30,9 +29,9 @@
-->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
+ </driver>
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>8</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -51,29 +50,31 @@
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<scale>1</scale>
- </driver>
+ </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 name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalFilteredHits</inputHitCollectionName>
+ <!-- <clusterWindow>32.0</clusterWindow> -->
+ <!-- addEMin clusterWindow -->
+ <cuts>0.0 32.0</cuts>
</driver>
<driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<outputFileName>${outputFile}.triggers</outputFileName>
- </driver>
+ </driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
</driver>
- <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ <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>
+ </driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim Thu Jan 15 15:47:16 2015
@@ -35,20 +35,22 @@
<!--
Uncomment to include legacy clustering from Test Run proposal algorithm.
<driver name="LegacyClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
- <logLevel>warning</logLevel>
+ <logLevel>WARNING</logLevel>
<outputClusterCollectionName>EcalClustersLegacy</outputClusterCollectionName>
<clustererName>LegacyClusterer</clustererName>
<cuts>0.1 0.01</cuts>
</driver>
-->
<driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
- <logLevel>warning</logLevel>
+ <logLevel>WARNING</logLevel>
<outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
<hitEnergyThreshold>0.01</hitEnergyThreshold>
<seedEnergyThreshold>0.100</seedEnergyThreshold>
<clusterEnergyThreshold>0.200</clusterEnergyThreshold>
+<!--
<calculateProperties>false</calculateProperties>
<applyCorrections>true</applyCorrections>
+-->
<!--
<minTime></minTime>
<timeWindow></timeWindow>
@@ -57,13 +59,15 @@
<writeRejectedHitCollection>false</writeRejectedHitCollection>
</driver>
<driver name="GTPOnlineClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
- <logLevel>warning</logLevel>
+ <logLevel>WARNING</logLevel>
<clustererName>GTPOnlineClusterer</clustererName>
<outputClusterCollectionName>EcalClustersGTP</outputClusterCollectionName>
<!-- seedMinEnergy -->
<cuts>0.100</cuts>
+<!--
<calculateProperties>true</calculateProperties>
<applyCorrections>false</applyCorrections>
+-->
</driver>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<!-- Uncomment if you only want specific collections in the output. -->
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim Thu Jan 15 15:47:16 2015
@@ -1,62 +1,58 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
+ <driver name="EventMarkerDriver" />
<driver name="SvtSensorSetup" />
- <driver name="RawTrackerHitSensorSetup"/>
+ <driver name="RawTrackerHitSensorSetup" />
<driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
- <driver name="GBLDriver"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="GBLDriver" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
- </driver>
- <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+ </driver>
+ <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
<debug>0</debug>
<isMC>${isMC}</isMC>
<gblFileName>gblinput.txt</gblFileName>
- </driver>
+ </driver>
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
<!-- Reconstruction drivers below -->
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>false</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="HelicalTrackHitDriver"
- type="org.hps.recon.tracking.HelicalTrackHitDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <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-TestRun-357.xml</strategyResource>
<!-- <strategyResource>/org/hps/recon/tracking/strategies/${strategy}.xml</strategyResource>-->
- </driver>
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
- </drivers>
-</lcsim>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+ </drivers>
+</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 Thu Jan 15 15:47:16 2015
@@ -55,10 +55,8 @@
<useTimestamps>true</useTimestamps>
<useTruthTime>false</useTruthTime>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterIC">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <timeCut>true</timeCut>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
+ <useTimeCut>true</useTimeCut>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
</driver>
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 Thu Jan 15 15:47:16 2015
@@ -58,10 +58,8 @@
<useTimestamps>true</useTimestamps>
<useTruthTime>false</useTruthTime>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterIC">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <timeCut>true</timeCut>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
+ <useTimeCut>true</useTimeCut>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
</driver>
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 Thu Jan 15 15:47:16 2015
@@ -60,10 +60,8 @@
<useTimestamps>false</useTimestamps>
<useTruthTime>true</useTruthTime>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterIC">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- <timeCut>true</timeCut>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
+ <useTimeCut>true</useTimeCut>
</driver>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim Thu Jan 15 15:47:16 2015
@@ -38,9 +38,8 @@
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
<driver name="TwoTrackFilter"
type="org.hps.util.TwoTrackFilterDriver">
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim Thu Jan 15 15:47:16 2015
@@ -11,7 +11,6 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="SVTSetupDriver"/>
<driver name="TrackerDigiDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
@@ -19,9 +18,6 @@
<!-- <driver name="LCIOWriter"/> -->
</execute>
<drivers>
- <driver name="SVTSetupDriver"
- type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
- </driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim Thu Jan 15 15:47:16 2015
@@ -1,95 +1,69 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="SVTSetupDriver"/>
- <driver name="EcalRawConverter"/>
- <driver name="EcalClusterer"/>
-<!-- <driver name="SVTEventPlots"/> -->
-<!-- <driver name="SVTPulsePlots"/> -->
- <driver name="RawTrackerHitFitterDriver"/>
- <driver name="TrackerHitDriver"/>
-<!-- <driver name="SVTHitRecoPlots"/> -->
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="TrackingReconstructionPlots"/>
- <driver name="LCIOWriter"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <!-- <driver name="SVTEventPlots"/> -->
+ <!-- <driver name="SVTPulsePlots"/> -->
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver" />
+ <!-- <driver name="SVTHitRecoPlots"/> -->
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
+ <driver name="TrackingReconstructionPlots" />
+ <driver name="LCIOWriter" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
- <driver name="EcalRawConverter"
- type="org.hps.recon.ecal.EcalRawConverterDriver">
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
- <driver name="EcalClusterer"
- type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
- </driver>
-
- <driver name="RawTrackerHitFitterDriver"
- type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
- <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
- <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
- <fitAlgorithm>Analytic</fitAlgorithm>
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+ <ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
-
- <driver name="TrackerHitDriver"
- type="org.hps.recon.tracking.DataTrackerHitDriver"/>
-
- <driver name="SVTEventPlots"
- type="org.hps.monitoring.drivers.svt.SVTEventInfo">
- <outputPlots>svtEventInfoPlots.aida</outputPlots>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
-
- <driver name="SVTHitRecoPlots"
- type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
- <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
- <outputPlots>svtHitRecoPlots.aida</outputPlots>
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
+ <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
+ <fitAlgorithm>Analytic</fitAlgorithm>
</driver>
-
- <driver name="SVTPulsePlots"
- type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- <outputPlots>svtPulsePlots.aida</outputPlots>
- </driver>
-
-
- <driver name="SVTSetupDriver"
- type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
- </driver>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="SVTEventPlots"
+ type="org.hps.monitoring.drivers.svt.SVTEventInfo">
+ <outputPlots>svtEventInfoPlots.aida</outputPlots>
+ </driver>
+ <driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
+ <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
+ <outputPlots>svtHitRecoPlots.aida</outputPlots>
+ </driver>
+ <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
+ <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+ <outputPlots>svtPulsePlots.aida</outputPlots>
+ </driver>
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
<driver name="HelicalTrackHitDriver"
- type="org.hps.recon.tracking.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.AxialTrackReconDriver">
+ type="org.hps.recon.tracking.AxialTrackReconDriver">
<debug>true</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
- </driver>
-
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
- <outputPlots>trackingPlots.aida</outputPlots>
</driver>
-
-
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
+ <driver name="TrackingReconstructionPlots"
+ type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
+ <outputPlots>trackingPlots.aida</outputPlots>
+ </driver>
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>/Users/mgraham/HPS/HPSData/hps_000820_trackRecon.slcio</outputFilePath>
</driver>
-
- <driver name="CleanupDriver"
- type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
- <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
+ <driver name="CleanupDriver"
+ type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+ <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
</driver>
-
- </drivers>
+ </drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim Thu Jan 15 15:47:16 2015
@@ -1,6 +1,5 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<inputFiles>
<!--<fileRegExp baseDir="./../data/mc/Reach-2pt2" >.*gev60.*</fileRegExp>-->
<!-- <fileRegExp baseDir="./../data/mc/Reach-2pt2" >.*gev100.*</fileRegExp>-->
@@ -9,20 +8,19 @@
<!-- <numberOfEvents>10000</numberOfEvents>-->
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
- <driver name="EcalRawConverter"/>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalRawConverter" />
<!-- <driver name="EcalRawConverterDriver"/> -->
<!-- <driver name="EcalTriggerFilter"/> -->
- <driver name="EcalTriggerClusterer"/>
+ <driver name="EcalTriggerClusterer" />
<!-- <driver name="SimpleSVTReadout"/> -->
- <driver name="EcalTrigger"/>
- <driver name="ClockDriver"/>
+ <driver name="EcalTrigger" />
+ <driver name="ClockDriver" />
<!-- <driver name="MCParticlePlots"/>-->
<!-- <driver name="TriggerTurnOnAnalysis"/>-->
-
- </execute>
+ </execute>
<drivers>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
@@ -39,28 +37,26 @@
<inputCollection>EcalTriggerHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>-->
- <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
-<!-- <ecalCollectionName>EcalFilteredHits</ecalCollectionName>-->
- <clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
+ <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalReadoutAnalogHits</inputHitCollectionName>
+ <outputClusterCollectionName>EcalTriggerClusters</outputClusterCollectionName>
</driver>
<!-- <driver name="EcalTrigger" type="org.hps.recon.ecal.TestRunTriggerDriver">-->
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
<!--<driver name="EcalTrigger" type="org.hps.recon.ecal.HPSFADCSingleTriggerDriver">-->
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
- <outputFileName>${outputFile}.triggers</outputFileName>
+ <outputFileName>${outputFile}.triggers</outputFileName>
<deadTime>0</deadTime>
<!--<lcioFile>${outputFile}</lcioFile>-->
- </driver>
+ </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="ClockDriver" type="org.hps.readout.ecal.ClockDriver" />
<driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
<hideFrame>true</hideFrame>
</driver>
@@ -69,4 +65,4 @@
<hideFrame>true</hideFrame>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim Thu Jan 15 15:47:16 2015
@@ -3,49 +3,42 @@
@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">
+<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="EcalReadout"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalTrigger"/>
-
- <driver name="SimpleSVTReadout"/>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalReadout" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalTrigger" />
+ <driver name="SimpleSVTReadout" />
<!-- <driver name="SVTReadout"/>
<driver name="Digitization"/>
<driver name="DataProcessing"/>-->
- <driver name="TestRunReconToLcio"/>
-
- <driver name="AidaSaveDriver"/>
-
- <driver name="ClockDriver"/>
- <driver name="CleanupDriver"/>
- </execute>
-
+ <driver name="TestRunReconToLcio" />
+ <driver name="AidaSaveDriver" />
+ <driver name="ClockDriver" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
+ </driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
</driver>
-
<driver name="EcalReadout" type="org.hps.users.gcharles.FADCSignalAnalysis">
</driver>
-
- <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <clusterWindow>8.0</clusterWindow>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
+ <!-- addEMin clusterWindow -->
+ <cuts>0.0 8.0</cuts>
</driver>
-
<driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<outputFileName>${outputFile}.triggers</outputFileName>
- </driver>
+ </driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
</driver>
@@ -64,16 +57,12 @@
<numberOfSamplesAboveThreshold>3</numberOfSamplesAboveThreshold>
<numberOfSamplesToReadOut>6</numberOfSamplesToReadOut>
</driver>-->
-
- <driver name="AidaSaveDriver"
- type="org.lcsim.job.AidaSaveDriver">
+ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}_triggerPlots</outputFileName>
</driver>
-
- <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver" />
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
- </driver>
+ </driver>
</drivers>
-</lcsim>
-
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim Thu Jan 15 15:47:16 2015
@@ -3,85 +3,72 @@
@author Sho Uemura <[log in to unmask]>
@version $Id: ecal_fadc_bkgd.lcsim,v 1.1 2013/03/01 23:22:25 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>
- </control>
- <execute>
- <driver name="EventMarkerDriver"/>
- <driver name="EcalReadout"/>
- <driver name="EcalConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalTrigger"/>
+<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>
+ </control>
+ <execute>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalReadout" />
+ <driver name="EcalConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalTrigger" />
<!-- <driver name="EcalPlots"/>-->
- <driver name="EcalFADCPlots"/>
- <driver name="EcalTriggerPlots"/>
- <driver name="MCParticlePlots"/>
+ <driver name="EcalFADCPlots" />
+ <driver name="EcalTriggerPlots" />
+ <driver name="MCParticlePlots" />
<!-- <driver name="Writer"/>-->
- <driver name="AidaSaveDriver"/>
- <driver name="ClockDriver"/>
- </execute>
- <drivers>
- <driver name="Writer"
- type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${outputFile}_ecalClusters</outputFilePath>
- </driver>
- <driver name="EcalReadout"
- type="org.hps.readout.ecal.FADCEcalReadoutDriver">
- <readoutPeriod>4.0</readoutPeriod>
- <coincidenceWindow>2</coincidenceWindow>
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalHits</ecalCollectionName>
- <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
+ <driver name="AidaSaveDriver" />
+ <driver name="ClockDriver" />
+ </execute>
+ <drivers>
+ <driver name="Writer" type="org.lcsim.util.loop.LCIODriver">
+ <outputFilePath>${outputFile}_ecalClusters</outputFilePath>
+ </driver>
+ <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
+ <readoutPeriod>4.0</readoutPeriod>
+ <coincidenceWindow>2</coincidenceWindow>
+ <ecalName>Ecal</ecalName>
+ <ecalCollectionName>EcalHits</ecalCollectionName>
+ <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
<triggerThreshold>80</triggerThreshold>
<readoutThreshold>50</readoutThreshold>
<scaleFactor>1</scaleFactor>
<fixedGain>0.15</fixedGain>
- </driver>
- <driver name="EcalConverter"
- type="org.hps.recon.ecal.EcalRawConverterDriver">
- <rawCollectionName>EcalRawHits</rawCollectionName>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
- <gain>0.15</gain>
- </driver>
- <driver name="EcalClusterer"
- type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
- </driver>
- <driver name="EcalTrigger"
- type="org.hps.readout.ecal.FADCTriggerDriver">
- <clusterCollectionName>EcalClusters</clusterCollectionName>
- <outputFileName>${outputFile}.triggers</outputFileName>
- <deadTime>10</deadTime>
- </driver>
- <driver name="EcalPlots"
- type="org.hps.analysis.ecal.HPSEcalPlotsDriver">
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
- </driver>
- <driver name="EcalFADCPlots"
- type="org.hps.analysis.ecal.HPSEcalFADCPlotsDriver">
- <rawCollectionName>EcalRawHits</rawCollectionName>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
- <edepThreshold>0.05</edepThreshold>
- </driver>
- <driver name="EcalTriggerPlots"
- type="org.hps.analysis.ecal.HPSEcalTriggerPlotsDriver">
- </driver>
- <driver name="MCParticlePlots"
- type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
- </driver>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1000</eventInterval>
- </driver>
- <driver name="AidaSaveDriver"
- type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${outputFile}_ecalPlots</outputFileName>
- </driver>
- <driver name="ClockDriver"
- type="org.hps.readout.ecal.ClockDriver">
- </driver>
- </drivers>
-</lcsim>
+ </driver>
+ <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+ <rawCollectionName>EcalRawHits</rawCollectionName>
+ <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ <gain>0.15</gain>
+ </driver>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
+ </driver>
+ <driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
+ <clusterCollectionName>EcalClusters</clusterCollectionName>
+ <outputFileName>${outputFile}.triggers</outputFileName>
+ <deadTime>10</deadTime>
+ </driver>
+ <driver name="EcalPlots" type="org.hps.analysis.ecal.HPSEcalPlotsDriver">
+ <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ </driver>
+ <driver name="EcalFADCPlots" type="org.hps.analysis.ecal.HPSEcalFADCPlotsDriver">
+ <rawCollectionName>EcalRawHits</rawCollectionName>
+ <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ <edepThreshold>0.05</edepThreshold>
+ </driver>
+ <driver name="EcalTriggerPlots" type="org.hps.analysis.ecal.HPSEcalTriggerPlotsDriver">
+ </driver>
+ <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
+ </driver>
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>1000</eventInterval>
+ </driver>
+ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+ <outputFileName>${outputFile}_ecalPlots</outputFileName>
+ </driver>
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver">
+ </driver>
+ </drivers>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim Thu Jan 15 15:47:16 2015
@@ -1,20 +1,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="EventMarkerDriver"/>
- <driver name="EcalIDPrint"/>
- <driver name="SVTDataIDPrint"/>
- <driver name="SVTIDPrint"/>
- </execute>
- <drivers>
- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
- </driver>
- <driver name="EcalIDPrint" type="org.hps.monitoring.drivers.ecal.ECalCellIDPrintDriver"/>
- <driver name="SVTDataIDPrint" type="org.hps.monitoring.drivers.svt.SVTCellIDPrintDriver"/>
- <driver name="SVTIDPrint" type="org.hps.monitoring.drivers.svt.SVTCellIDPrintDriver">
- <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
- </driver>
- </drivers>
-</lcsim>
+<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="EcalIDPrint" />
+ <driver name="SVTDataIDPrint" />
+ <driver name="SVTIDPrint" />
+ </execute>
+ <drivers>
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>1</eventInterval>
+ </driver>
+ <driver name="EcalIDPrint" type="org.hps.analysis.ecal.ECalCellIDPrintDriver" />
+ <driver name="SVTDataIDPrint" type="org.hps.monitoring.drivers.svt.SVTCellIDPrintDriver" />
+ <driver name="SVTIDPrint" type="org.hps.monitoring.drivers.svt.SVTCellIDPrintDriver">
+ <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+ </driver>
+ </drivers>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim Thu Jan 15 15:47:16 2015
@@ -3,44 +3,37 @@
@author Sho Uemura <[log in to unmask]>
@version $Id: raw_triggers.lcsim,v 1.1 2013/03/01 23:22:25 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>
- </control>
- <execute>
+<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>
+ </control>
+ <execute>
<!-- <driver name="EventMarkerDriver"/>-->
- <driver name="EcalClusterer"/>
- <driver name="EcalTrigger"/>
+ <driver name="EcalClusterer" />
+ <driver name="EcalTrigger" />
<!-- <driver name="MCParticlePlots"/>-->
- <driver name="AidaSaveDriver"/>
- <driver name="ClockDriver"/>
- </execute>
- <drivers>
- <driver name="EcalClusterer"
- type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalHits</ecalCollectionName>
- <addEMin>0.075</addEMin>
- </driver>
- <driver name="EcalTrigger"
- type="org.hps.analysis.ecal.TestRunRateAnalysis">
- <clusterCollectionName>EcalClusters</clusterCollectionName>
+ <driver name="AidaSaveDriver" />
+ <driver name="ClockDriver" />
+ </execute>
+ <drivers>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
+ <!-- minClusterSeedEnergy minHitEnergy -->
+ <cuts>0.05 0.075</cuts>
+ </driver>
+ <driver name="EcalTrigger" type="org.hps.analysis.ecal.TestRunRateAnalysis">
+ <clusterCollectionName>EcalClusters</clusterCollectionName>
<clusterEnergyLow>0.6</clusterEnergyLow>
- </driver>
- <driver name="MCParticlePlots"
- type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
- </driver>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>10000</eventInterval>
- </driver>
- <driver name="AidaSaveDriver"
- type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${inputFile}_ecalPlots</outputFileName>
- </driver>
- <driver name="ClockDriver"
- type="org.hps.readout.ecal.ClockDriver">
- </driver>
- </drivers>
-</lcsim>
+ </driver>
+ <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
+ </driver>
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>10000</eventInterval>
+ </driver>
+ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+ <outputFileName>${inputFile}_ecalPlots</outputFileName>
+ </driver>
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver">
+ </driver>
+ </drivers>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim Thu Jan 15 15:47:16 2015
@@ -2,42 +2,42 @@
Steering file for testing DataQualityMonitoring classes
@author Matt Graham <[log in to unmask]>
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="EventMarkerDriver" />
<!-- <driver name="DQMDatabaseDriver"/> -->
- <driver name="RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="TrackDataDriver"/>
+ <driver name="RawTrackerHitSensorSetup" />
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
+ <driver name="TrackDataDriver" />
<driver name="EcalRawConverter" />
- <driver name="EcalClusterer" />
- <driver name="ReconParticle" />
- <driver name="SVTMonitoring"/>
- <driver name="SVTHitMCEfficiency"/>
- <driver name="TrackingMonitoring"/>
- <driver name="TrackingResiduals"/>
- <driver name="TrackMCEfficiency"/>
- <driver name="FinalStateMonitoring"/>
- <driver name="V0Monitoring"/>
+ <driver name="EcalClusterer" />
+ <driver name="ReconParticle" />
+ <driver name="SVTMonitoring" />
+ <driver name="SVTHitMCEfficiency" />
+ <driver name="TrackingMonitoring" />
+ <driver name="TrackingResiduals" />
+ <driver name="TrackMCEfficiency" />
+ <driver name="FinalStateMonitoring" />
+ <driver name="V0Monitoring" />
<!-- <driver name="AddBeamSpotToTrack"/>
<driver name="BSTrackReconParticle" />
- <driver name="BeamSpotTrackAnalysis"/> -->
- <driver name="AidaSaveDriver"/>
- <driver name="LCIOWriter"/>
- <driver name="CleanupDriver"/>
- </execute>
- <drivers>
- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
+ <driver name="BeamSpotTrackAnalysis"/> -->
+ <driver name="AidaSaveDriver" />
+ <driver name="LCIOWriter" />
+ <driver name="CleanupDriver" />
+ </execute>
+ <drivers>
+ <!-- The database access is broken from missing prop file. JM -->
+ <!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver" /> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
- </driver>
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
- <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<useTimestamps>false</useTimestamps>
<correctT0Shift>false</correctT0Shift>
@@ -46,37 +46,35 @@
</driver>
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
<debug>false</debug>
- </driver>
+ </driver>
<driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<clusterTimeCut>16.0</clusterTimeCut>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
- <saveAxialHits>true</saveAxialHits>
+ <saveAxialHits>true</saveAxialHits>
</driver>
-
<driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
- </driver>
- <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
- </driver>
+ <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
+ </driver>
+ <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <!-- FIXME: This should probably be using a different clusterer. JM -->
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="AddBeamSpotToTrack" type="org.hps.users.mgraham.AddBeamSpotToTrack">
+ <driver name="AddBeamSpotToTrack" type="org.hps.users.mgraham.AddBeamSpotToTrack">
</driver>
- <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis">
+ <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis">
</driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>false</debug>
</driver>
-
- <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>true</debug>
<tracksCollectionName>BeamSpotTracks</tracksCollectionName>
<finalStateParticlesColName>BSFinalStateParticles</finalStateParticlesColName>
@@ -87,41 +85,39 @@
<beamConV0VerticesColName>BSBeamspotConstrainedV0Vertices</beamConV0VerticesColName>
<targetConV0VerticesColName>BSTargetConstrainedV0Vertices</targetConV0VerticesColName>
</driver>
-
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>./conditions_test_plots.root</outputFileName>
+ <outputFileName>./conditions_test_plots.root</outputFileName>
</driver>
<driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
+ </driver>
+ <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
<overwriteDB>false</overwriteDB>
- </driver>
+ </driver>
<driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency">
<overwriteDB>false</overwriteDB>
<printDQMStrings>false</printDQMStrings>
- </driver>
- <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
+ </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>blah.slcio</outputFilePath>
</driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim Thu Jan 15 15:47:16 2015
@@ -1,40 +1,41 @@
<!--
- Steering file for testing DataQualityMonitoring classes
- @author Matt Graham <[log in to unmask]>
+ Steering file for testing DataQualityMonitoring classes @author Matt Graham <[log in to unmask]>
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="DQMDatabaseDriver"/>
- <driver name="RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" />
- <!-- <driver name="RawTrackerHitFitterDriver" />-->
- <!-- <driver name="TrackerHitDriver"/>-->
- <!-- <driver name="HelicalTrackHitDriver"/>-->
- <!-- <driver name="TrackerReconDriver"/>-->
- <!-- <driver name="TrackDataDriver"/>-->
- <!-- <driver name="EcalRawConverter" />-->
- <!-- <driver name="EcalClusterer" />-->
- <!-- <driver name="ReconParticle" /> -->
- <driver name="SVTMonitoring"/>
- <driver name="SVTHitMCEfficiency"/>
- <driver name="TrackingMonitoring"/>
- <driver name="TrackingResiduals"/>
- <driver name="TrackMCEfficiency"/>
- <driver name="FinalStateMonitoring"/>
- <driver name="V0Monitoring"/>
- <driver name="AidaSaveDriver"/>
- <driver name="CleanupDriver"/>
- </execute>
- <drivers>
- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
+ <driver name="EventMarkerDriver" />
+ <!--
+ This is broken so commenting out. JM
+ <driver name="DQMDatabaseDriver" />
+ -->
+ <driver name="RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" />
+ <!-- <driver name="RawTrackerHitFitterDriver" /> -->
+ <!-- <driver name="TrackerHitDriver"/> -->
+ <!-- <driver name="HelicalTrackHitDriver"/> -->
+ <!-- <driver name="TrackerReconDriver"/> -->
+ <!-- <driver name="TrackDataDriver"/> -->
+ <!-- <driver name="EcalRawConverter" /> -->
+ <!-- <driver name="EcalClusterer" /> -->
+ <!-- <driver name="ReconParticle" /> -->
+ <driver name="SVTMonitoring" />
+ <driver name="SVTHitMCEfficiency" />
+ <driver name="TrackingMonitoring" />
+ <driver name="TrackingResiduals" />
+ <driver name="TrackMCEfficiency" />
+ <driver name="FinalStateMonitoring" />
+ <driver name="V0Monitoring" />
+ <driver name="AidaSaveDriver" />
+ <driver name="CleanupDriver" />
+ </execute>
+ <drivers>
+ <!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver" /> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
- </driver>
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
- <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<useTimestamps>false</useTimestamps>
<correctT0Shift>false</correctT0Shift>
@@ -43,70 +44,67 @@
</driver>
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
<debug>false</debug>
- </driver>
+ </driver>
<driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<clusterTimeCut>16.0</clusterTimeCut>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
-
<driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
- </driver>
- <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
- </driver>
+ <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
+ </driver>
+ <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>false</debug>
</driver>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>./conditions_test_plots.root</outputFileName>
+ <outputFileName>./conditions_test_plots.root</outputFileName>
</driver>
<driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
<printDQMStrings>true</printDQMStrings>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
- <runNumber>${runNumber}</runNumber>
- <overwriteDB>false</overwriteDB>
- <printDQMStrings>true</printDQMStrings>
- </driver>
- <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
- <runNumber>${runNumber}</runNumber>
+ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
<printDQMStrings>true</printDQMStrings>
- </driver>
- <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- <printDQMStrings>true</printDQMStrings>
- </driver>
- <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
+ <printDQMStrings>true</printDQMStrings>
+ </driver>
+ <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- <printDQMStrings>true</printDQMStrings>
- </driver>
+ <printDQMStrings>true</printDQMStrings>
+ </driver>
+ <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
+ <overwriteDB>false</overwriteDB>
+ <printDQMStrings>true</printDQMStrings>
+ </driver>
<driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency">
<overwriteDB>false</overwriteDB>
<printDQMStrings>true</printDQMStrings>
- </driver>
- <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
- <runNumber>${runNumber}</runNumber>
- <printDQMStrings>true</printDQMStrings>
+ </driver>
+ <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
+ <runNumber>${runNumber}</runNumber>
+ <printDQMStrings>true</printDQMStrings>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
+ </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorTestRunData.lcsim Thu Jan 15 15:47:16 2015
@@ -2,88 +2,83 @@
Steering file for testing DataQualityMonitoring classes
@author Matt Graham <[log in to unmask]>
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="DQMDatabaseDriver"/>
- <driver name="RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" />
+ <driver name="EventMarkerDriver" />
+ <!-- <driver name="DQMDatabaseDriver" /> -->
+ <driver name="RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
- <driver name="ReconParticle" />
- <driver name="SVTMonitoring"/>
- <driver name="TrackingMonitoring"/>
- <driver name="FinalStateMonitoring"/>
- <driver name="V0Monitoring"/>
- <driver name="AidaSaveDriver"/>
- <driver name="CleanupDriver"/>
- </execute>
- <drivers>
- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
+ <driver name="ReconParticle" />
+ <driver name="SVTMonitoring" />
+ <driver name="TrackingMonitoring" />
+ <driver name="FinalStateMonitoring" />
+ <driver name="V0Monitoring" />
+ <driver name="AidaSaveDriver" />
+ <driver name="CleanupDriver" />
+ </execute>
+ <drivers>
+ <!-- Broken due to missing prop file. JM -->
+ <!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver" /> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
- </driver>
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
- <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <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">
<debug>false</debug>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
- </driver>
+ <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>true</debug>
</driver>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
-
<driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
- <runNumber>${runNumber}</runNumber>
- <connectToDB>true</connectToDB>
+ <runNumber>${runNumber}</runNumber>
+ <connectToDB>true</connectToDB>
<overwriteDB>true</overwriteDB>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <runNumber>${runNumber}</runNumber>
<connectToDB>true</connectToDB>
<overwriteDB>true</overwriteDB>
- </driver>
- <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
+ <runNumber>${runNumber}</runNumber>
<connectToDB>true</connectToDB>
<overwriteDB>true</overwriteDB>
- </driver>
-
- <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
- <runNumber>${runNumber}</runNumber>
- <connectToDB>true</connectToDB>
+ </driver>
+ <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
+ <runNumber>${runNumber}</runNumber>
+ <connectToDB>true</connectToDB>
<overwriteDB>true</overwriteDB>
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>./${runNumber}_dqm_plots.root</outputFileName>
+ <outputFileName>./${runNumber}_dqm_plots.root</outputFileName>
</driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim Thu Jan 15 15:47:16 2015
@@ -2,39 +2,39 @@
Steering file for testing DataQualityMonitoring classes
@author Matt Graham <[log in to unmask]>
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="ConditionsDriver"/>
+ <driver name="EventMarkerDriver" />
+ <driver name="ConditionsDriver" />
<driver name="SvtSensorSetup" />
- <driver name="RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
+ <driver name="RawTrackerHitSensorSetup" />
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
<!-- <driver name="TrackerReconDriver"/>
- <driver name="TrackDataDriver"/> -->1
- <driver name="AxialTrackReconDriver"/>
+ <driver name="TrackDataDriver"/> -->
+ <driver name="AxialTrackReconDriver" />
<driver name="EcalRawConverter" />
- <driver name="EcalClusterer" />
- <driver name="ReconParticle" />
- <driver name="TrackingMonitoring"/>
- <driver name="TrackMCEfficiency"/>
+ <driver name="EcalClusterer" />
+ <driver name="ReconParticle" />
+ <driver name="TrackingMonitoring" />
+ <driver name="TrackMCEfficiency" />
<!-- <driver name="StraightTrackAnalysis"/> -->
- <driver name="AidaSaveDriver"/>
- <driver name="LCIOWriter"/>
- <driver name="CleanupDriver"/>
- </execute>
- <drivers>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+ <driver name="AidaSaveDriver" />
+ <driver name="LCIOWriter" />
+ <driver name="CleanupDriver" />
+ </execute>
+ <drivers>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
<driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/>
+ <!-- Broken due to missing prop file. JM -->
+ <!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver" /> -->
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
- </driver>
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
- <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<useTimestamps>false</useTimestamps>
<correctT0Shift>false</correctT0Shift>
@@ -43,37 +43,34 @@
</driver>
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
<debug>false</debug>
- </driver>
+ </driver>
<driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>true</debug>
<clusterTimeCut>16.0</clusterTimeCut>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
- <saveAxialHits>true</saveAxialHits>
+ <saveAxialHits>true</saveAxialHits>
</driver>
-
<driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
- </driver>
- <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
- </driver>
+ <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
+ </driver>
+ <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="AddBeamSpotToTrack" type="org.hps.users.mgraham.AddBeamSpotToTrack">
+ <driver name="AddBeamSpotToTrack" type="org.hps.users.mgraham.AddBeamSpotToTrack">
</driver>
- <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis">
+ <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis">
</driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>false</debug>
</driver>
-
- <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
<debug>true</debug>
<tracksCollectionName>BeamSpotTracks</tracksCollectionName>
<finalStateParticlesColName>BSFinalStateParticles</finalStateParticlesColName>
@@ -84,60 +81,50 @@
<beamConV0VerticesColName>BSBeamspotConstrainedV0Vertices</beamConV0VerticesColName>
<targetConV0VerticesColName>BSTargetConstrainedV0Vertices</targetConV0VerticesColName>
</driver>
-
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>./conditions_test_plots.root</outputFileName>
+ <outputFileName>./conditions_test_plots.root</outputFileName>
</driver>
<driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
<trackCollectionName>StraightTracks</trackCollectionName>
- </driver>
- <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
-
+ </driver>
<driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency">
<overwriteDB>false</overwriteDB>
<printDQMStrings>false</printDQMStrings>
- </driver>
- <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
+ </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>blah.slcio</outputFilePath>
</driver>
-
- <driver name="AxialTrackReconDriver"
- type="org.hps.recon.tracking.axial.AxialTrackReconDriver">
+ <driver name="AxialTrackReconDriver" type="org.hps.recon.tracking.axial.AxialTrackReconDriver">
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Axial.xml</strategyResource>
<trackCollectionName>StraightTracks</trackCollectionName>
</driver>
-
<driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
<overwriteDB>false</overwriteDB>
- <trackCollectionName>StraightTracks</trackCollectionName>
- <trackHitCollectionName>RotatedAxialTrackHits</trackHitCollectionName>
- <trackHitMCRelationsCollectionName>RotatedAxialTrackHitsMCRelations</trackHitMCRelationsCollectionName>
- </driver>
-
- <driver name="StraightTrackAnalysis"
- type="org.hps.users.mgraham.StraightTrackAnalysis">
- <tracksName>StraightTracks</tracksName>
- </driver>
-
+ <trackCollectionName>StraightTracks</trackCollectionName>
+ <trackHitCollectionName>RotatedAxialTrackHits</trackHitCollectionName>
+ <trackHitMCRelationsCollectionName>RotatedAxialTrackHitsMCRelations</trackHitMCRelationsCollectionName>
+ </driver>
+ <driver name="StraightTrackAnalysis" type="org.hps.users.mgraham.StraightTrackAnalysis">
+ </driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim Thu Jan 15 15:47:16 2015
@@ -1,109 +1,85 @@
-<!--
- This is meant to be used on raw LCIO MC files (i.e. slic output)
- Disregard time; no trigger; use TrackerDigiDriver to do readout.
- @author Matt Graham <[log in to unmask]>
- @version $Id: NoTimeNoTriggerRecon.lcsim,v 1.2 2014/07/03 23:22:24 mgraham Exp $
--->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<!-- This is meant to be used on raw LCIO MC files (i.e. slic output) Disregard time; no trigger; use TrackerDigiDriver to do readout. @author Matt Graham <[log in to unmask]> @version $Id: NoTimeNoTriggerRecon.lcsim,v 1.2 2014/07/03 23:22:24 mgraham 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>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
- <driver name="TrackerDigiDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="AxialTrackReconDriver"/>
-<!-- <driver name="TrackerReconDriver"/>
- <driver name="TrackDataDriver"/> -->
-<!-- <driver name="StraightTrackReconDriver"/> -->
- <driver name="StraightTrackAnalysis"/>
- <driver name="SVTMonitoring"/>
- <driver name="TrackingMonitoring"/>
- <driver name="TrackingResiduals"/>
- <driver name="AidaSaveDriver"/>
- <driver name="LCIOWriter"/>
- <driver name="CleanupDriver"/>
-
+ <driver name="EventMarkerDriver" />
+ <driver name="TrackerDigiDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="AxialTrackReconDriver" />
+ <!-- <driver name="TrackerReconDriver"/> <driver name="TrackDataDriver"/> -->
+ <!-- <driver name="StraightTrackReconDriver"/> -->
+ <driver name="StraightTrackAnalysis" />
+ <driver name="SVTMonitoring" />
+ <driver name="TrackingMonitoring" />
+ <driver name="TrackingResiduals" />
+ <driver name="AidaSaveDriver" />
+ <driver name="LCIOWriter" />
+ <driver name="CleanupDriver" />
</execute>
-
<drivers>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
-
<driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
-<!-- <dropBadChannels>true</dropBadChannels>-->
+ <!-- <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>
<saveAxialHits>true</saveAxialHits>
</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-Full.xml</strategyResource>
</driver>
-
- <driver name="AxialTrackReconDriver"
- type="org.hps.recon.tracking.axial.AxialTrackReconDriver">
+ <driver name="AxialTrackReconDriver" type="org.hps.recon.tracking.axial.AxialTrackReconDriver">
<debug>true</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Axial.xml</strategyResource>
<trackCollectionName>StraightTracks</trackCollectionName>
</driver>
-
-
- <driver name="StraightTrackReconDriver"
- type="org.hps.recon.tracking.straighttracks.StraightTrackReconDriver">
+ <driver name="StraightTrackReconDriver" type="org.hps.recon.tracking.straighttracks.StraightTrackReconDriver">
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml</strategyResource>
</driver>
-
- <driver name="StraightTrackAnalysis"
- type="org.hps.users.mgraham.StraightTrackAnalysis">
- <tracksName>StraightTracks</tracksName>
- </driver>
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
+ <driver name="StraightTrackAnalysis" type="org.hps.users.mgraham.StraightTrackAnalysis">
+ <!-- <tracksName>StraightTracks</tracksName> -->
+ </driver>
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}</outputFilePath>
</driver>
- <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
- </driver>
- <driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
+ </driver>
+ <driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
</driver>
- <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
- <runNumber>${runNumber}</runNumber>
+ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
- <runNumber>${runNumber}</runNumber>
+ </driver>
+ <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
+ <runNumber>${runNumber}</runNumber>
<overwriteDB>false</overwriteDB>
- </driver>
- <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
+ </driver>
+ <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
<overwriteDB>false</overwriteDB>
- </driver>
+ </driver>
<driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency">
<overwriteDB>false</overwriteDB>
<printDQMStrings>false</printDQMStrings>
- </driver>
- <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>./straight-tracks.root</outputFileName>
- </driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
+ </driver>
+ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+ <outputFileName>./straight-tracks.root</outputFileName>
+ </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim Thu Jan 15 15:47:16 2015
@@ -3,17 +3,16 @@
@author Sho Uemura <[log in to unmask]>
@version $Id: HPS2014DumpEcal.lcsim,v 1.4 2013/10/30 16:23:33 phansson Exp $
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="EcalReadout"/>
- <driver name="EcalConverter"/>
- <driver name="EcalClusterer"/>
- <driver name="EcalTriggerVariables"/>
- <driver name="ClockDriver"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="EventMarkerDriver" />
+ <driver name="EcalReadout" />
+ <driver name="EcalConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="EcalTriggerVariables" />
+ <driver name="ClockDriver" />
+ <driver name="CleanupDriver" />
+ </execute>
<control>
<numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles>
@@ -22,8 +21,8 @@
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
- <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
+ </driver>
+ <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<readoutPeriod>4.0</readoutPeriod>
<coincidenceWindow>2</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -36,37 +35,26 @@
<!-- <fixedGain>0.15</fixedGain>-->
<!-- <debug>true</debug>-->
</driver>
-
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<!-- <gain>0.15</gain>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
<!-- <debug>true</debug>-->
- </driver>
-
-
- <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
- <ecalName>Ecal</ecalName>
- <clusterWindow>8.0</clusterWindow>
- <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
-
-
-
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>CTPClusterer</clustererName>
+ <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
+ <!-- addEMin clusterWindow -->
+ <cuts>0.0 8.0</cuts>
+ </driver>
<driver name="EcalTriggerVariables" type="org.hps.readout.ecal.FADCTriggerVariableDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<outputFileName>${outputFile}.txt</outputFileName>
- </driver>
-
-
-
-
-
- <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ </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>
- </driver>
+ </driver>
</drivers>
-</lcsim>
-
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim Thu Jan 15 15:47:16 2015
@@ -1,43 +1,33 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<inputFiles>
-<!--
--->
+ <!-- -->
</inputFiles>
<control>
<numberOfEvents>3000</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
</control>
-
<execute>
- <driver name="EventMarkerDriver"/>
+ <driver name="EventMarkerDriver" />
<driver name="BadChannelFilter" />
- <driver name="SimpleSVTReadout"/>
- <driver name="RawTrackerHitFitterDriver"/>
- <driver name="TrackerHitDriver"/>
- <!--
- <driver name="HPSSVTSensorSetup"/>
- <driver name="TrackerDigiDriver"/>
- -->
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="SVTEventInfo"/>
- <driver name="SVTHitReconstructionPlots"/>
- <driver name="TrackingReconstructionPlots"/>
- <driver name="LCIOWriter"/>
-
-
- </execute>
-
+ <driver name="SimpleSVTReadout" />
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver" />
+ <!--
+ <driver name="TrackerDigiDriver"/> -->
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
+ <driver name="SVTEventInfo" />
+ <driver name="SVTHitReconstructionPlots" />
+ <driver name="TrackingReconstructionPlots" />
+ <driver name="LCIOWriter" />
+ </execute>
<drivers>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
</driver>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
- <driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
<noPileup>true</noPileup>
</driver>
@@ -45,40 +35,29 @@
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="TrackerDigiDriver"
- type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
<debug>true</debug>
- </driver>
-
- <driver name="HelicalTrackHitDriver"
- type="org.hps.recon.tracking.HelicalTrackHitDriver">
+ </driver>
+ <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">
<debug>false</debug>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
- </driver>
-
+ </driver>
<driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>TrackingReconstructionPlots.aida</outputPlots>
</driver>
-
<driver name="SVTHitReconstructionPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<outputPlots>SVTHitReconstructionPlots.aida</outputPlots>
</driver>
-
<driver name="SVTEventInfo" type="org.hps.monitoring.drivers.svt.SVTEventInfo">
</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>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/SimpleTestRunReadoutToLcio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/SimpleTestRunReadoutToLcio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/SimpleTestRunReadoutToLcio.lcsim Thu Jan 15 15:47:16 2015
@@ -1,41 +1,25 @@
-<!--
- Execute test run full recon and write the results as an LCIO file.
--->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<?xml version="1.0" encoding="UTF-8"?><!-- Execute test run full recon and write the results as an LCIO file. -->
+<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="HPSSVTSensorSetup"/>
- <driver name="TrackerDigiDriver"/>
- <driver name="TrackingGeometryChecker"/>
- <driver name="LCIOWriter"/>
- <driver name="CleanupDriver"/>
- </execute>
-
+ <driver name="EventMarkerDriver" />
+ <driver name="TrackerDigiDriver" />
+ <driver name="TrackingGeometryChecker" />
+ <driver name="LCIOWriter" />
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
-
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
-
- <driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
-
- <driver name="TrackingGeometryChecker" type="org.hps.users.phansson.TrackingGeometryChecker"/>
-
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
+ </driver>
+ <driver name="TrackingGeometryChecker" type="org.hps.users.phansson.TrackingGeometryChecker" />
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}</outputFilePath>
</driver>
-
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
- </driver>
-
- <driver name="TrackerDigiDriver"
- type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
+ </driver>
+ <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
<debug>true</debug>
- </driver>
-
+ </driver>
</drivers>
-</lcsim>
-
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunOfflineRecon.lcsim Thu Jan 15 15:47:16 2015
@@ -3,39 +3,37 @@
@author Sho Uemura <[log in to unmask]>
@version $Id: TestRunOfflineRecon.lcsim,v 1.13 2013/10/30 16:23:32 phansson Exp $
-->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<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="RawTrackerHitSensorSetup" />
<driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
- <driver name="ReconParticle" />
- <driver name="TrackDataDriver" />
- <driver name="SVTEventInfo" />
- <driver name="SVTHitReconstructionPlots" />
- <driver name="TrackingReconstructionPlots" />
- <driver name="GBLDriver"/>
-
- <driver name="LCIOWriter"/>
- <driver name="CleanupDriver"/>
- </execute>
- <drivers>
+ <driver name="ReconParticle" />
+ <driver name="TrackDataDriver" />
+ <driver name="SVTEventInfo" />
+ <driver name="SVTHitReconstructionPlots" />
+ <driver name="TrackingReconstructionPlots" />
+ <driver name="GBLDriver" />
+ <driver name="LCIOWriter" />
+ <driver name="CleanupDriver" />
+ </execute>
+ <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 name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
<driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<maxSeperation>20.0</maxSeperation>
@@ -45,41 +43,32 @@
<debug>false</debug>
<!--<strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>-->
<strategyResource>/org/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
- </driver>
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver">
</driver>
<driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-
-
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
<driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>TrackingReconstructionPlots.aida</outputPlots>
</driver>
-
<driver name="SVTHitReconstructionPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<outputPlots>SVTHitReconstructionPlots.aida</outputPlots>
</driver>
-
<driver name="SVTEventInfo" type="org.hps.monitoring.drivers.svt.SVTEventInfo">
</driver>
-
- <driver name="GBLDriver"
- type="org.hps.recon.tracking.gbl.GBLOutputDriver">
- <debug>0</debug>
- <isMC>${isMC}</isMC>
- <gblFileName>gblinput.txt</gblFileName>
+ <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+ <debug>0</debug>
+ <isMC>${isMC}</isMC>
+ <gblFileName>gblinput.txt</gblFileName>
</driver>
-
-
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim Thu Jan 15 15:47:16 2015
@@ -1,103 +1,83 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<inputFiles>
- <!--<fileRegExp baseDir="./../data/mc/HPS-TestRun-v5/1.8-SNAPSHOT-recoil-101013/">egs_5.5gev_0.016x0_500mb_recoil_readout_[0-9].slcio</fileRegExp>-->
- <fileRegExp baseDir="./../data/testrun/mc/HPS-TestRun-v7/">egs_5.5gev_0.016x0_500mb_90na_readout_\d\d.slcio</fileRegExp>
+ <!--<fileRegExp baseDir="./../data/mc/HPS-TestRun-v5/1.8-SNAPSHOT-recoil-101013/">egs_5.5gev_0.016x0_500mb_recoil_readout_[0-9].slcio</fileRegExp> -->
+ <!-- Comment back in if you want to use this directory again in the job. JM -->
+ <!-- <fileRegExp baseDir="./../data/testrun/mc/HPS-TestRun-v7/">egs_5.5gev_0.016x0_500mb_90na_readout_\d\d.slcio</fileRegExp> -->
</inputFiles>
<control>
<numberOfEvents>1000000000</numberOfEvents>
<printInputFiles>true</printInputFiles>
<printDriversDetailed>true</printDriversDetailed>
- </control>
+ </control>
<execute>
- <driver name="EventMarkerDriver"/>
- <driver name="RawTrackerHitSensorSetup"/>
+ <driver name="EventMarkerDriver" />
+ <driver name="RawTrackerHitSensorSetup" />
<driver name="BadChannelFilter" />
<driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="TrackerReconDriver"/>
+ <driver name="TrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" />
+ <driver name="TrackerReconDriver" />
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
-<!-- <driver name="MCParticlePlots"/> -->
-<!-- <driver name="TruthMomentumAnalysis"/> -->
-<!-- <driver name="LCIOWriter"/> -->
- <driver name="ROOTFlatTupleDriver"/>
- <driver name="GBLOutputDriver"/>
-<!-- <driver name="PrintGeometryDriver"/>-->
-
-
-
- </execute>
-
+ <!-- <driver name="MCParticlePlots"/> -->
+ <!-- <driver name="TruthMomentumAnalysis"/> -->
+ <!-- <driver name="LCIOWriter"/> -->
+ <driver name="ROOTFlatTupleDriver" />
+ <driver name="GBLOutputDriver" />
+ <!-- <driver name="PrintGeometryDriver"/> -->
+ </execute>
<drivers>
- <driver name="GBLOutputDriver"
- type="org.hps.recon.tracking.gbl.GBLOutputDriver">
- <debug>0</debug>
- <isMC>${isMC}</isMC>
- <outputPlotFileName></outputPlotFileName>
- <gblFileName>gblinput.txt</gblFileName>
- </driver>
- <driver name="GBLDriver"
- type="org.hps.recon.tracking.gbl.GBLDriver">
- <debug>0</debug>
-
- </driver>
- <driver name="ROOTFlatTupleDriver"
- type="org.hps.users.phansson.ROOTFlatTupleDriver">
- <debug>false</debug>
- <outputPlotFileName></outputPlotFileName>
- <outputNameTextTuple>${outputFile}</outputNameTextTuple>
- <trackCollectionName>MatchedTracks</trackCollectionName>
- <targetPosition>-670.</targetPosition>
- </driver>
- <driver name="TruthMomentumAnalysis"
- type="org.hps.users.phansson.TruthMomentumResolutionDriver">
- <hideFrame>false</hideFrame>
- <debug>false</debug>
- </driver>
- <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
- <driver name="PrintGeometryDriver" type="org.hps.analysis.examples.PrintGeometryDriver"/>
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
+ <driver name="GBLOutputDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+ <debug>0</debug>
+ <isMC>${isMC}</isMC>
+ <outputPlotFileName />
+ <gblFileName>gblinput.txt</gblFileName>
+ </driver>
+ <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLDriver">
+ <debug>0</debug>
+ </driver>
+ <driver name="ROOTFlatTupleDriver" type="org.hps.users.phansson.ROOTFlatTupleDriver">
+ <debug>false</debug>
+ <outputPlotFileName />
+ <outputNameTextTuple>${outputFile}</outputNameTextTuple>
+ <trackCollectionName>MatchedTracks</trackCollectionName>
+ <targetPosition>-670.</targetPosition>
+ </driver>
+ <driver name="TruthMomentumAnalysis" type="org.hps.users.phansson.TruthMomentumResolutionDriver">
+ <hideFrame>false</hideFrame>
+ <debug>false</debug>
+ </driver>
+ <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
+ <driver name="PrintGeometryDriver" type="org.hps.analysis.examples.PrintGeometryDriver" />
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
- </driver>
- <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>false</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="HelicalTrackHitDriver"
- type="org.hps.recon.tracking.HelicalTrackHitDriver">
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <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/lcsim/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>-->
+ <!--<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource> -->
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/${strategy}.xml</strategyResource>
- </driver>
+ </driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
- <ecalName>Ecal</ecalName>
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <clustererName>LegacyClusterer</clustererName>
</driver>
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
- <!--<outputFilePath>${outputFile}.slcio</outputFilePath>-->
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
+ <!--<outputFilePath>${outputFile}.slcio</outputFilePath> -->
</driver>
-
-
-
-
-
-
-
- </drivers>
+ </drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/spaul/HitrateHistograms.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/spaul/HitrateHistograms.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/spaul/HitrateHistograms.lcsim Thu Jan 15 15:47:16 2015
@@ -1,26 +1,15 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
-
- <control>
+<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>
<verbose>true</verbose>
- </control>
-
- <classpath>
- <jar>users/target/hps-users-3.0-SNAPSHOT.jar</jar>
- </classpath>
-
+ </control>
<execute>
- <driver name="HitrateHistograms"/>
+ <driver name="HitrateHistograms" />
</execute>
-
<drivers>
- <driver name="HitrateHistograms" type="org.lcsim.hps.users.spaul.HitrateHistograms">
-
+ <driver name="HitrateHistograms" type="org.hps.users.spaul.HitrateHistograms">
</driver>
-
-
</drivers>
</lcsim>
