49 modified files
java/trunk/steering-files/src/main/resources/org/hps/steering/analysis
--- java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/StarterAnalysis.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/analysis/StarterAnalysis.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -19,9 +19,9 @@
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
- <driver name="StarterAnalysisDriver" type="org.hps.examples.StarterAnalysisDriver">
+ <driver name="StarterAnalysisDriver" type="org.hps.analysis.examples.StarterAnalysisDriver">
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -16,7 +16,7 @@
<eventInterval>1</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<applyBadCrystalMap>false</applyBadCrystalMap>
@@ -27,7 +27,7 @@
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.BasicMonitoringPlotsDriver"/>
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.BasicMonitoringPlotsDriver"/>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -26,26 +26,26 @@
<!--<driver name="AidaSaveDriver"/>-->
</execute>
<drivers>
- <!--<driver name="RunControlDriver" type="org.hps.monitoring.RunControlDriver"/>-->
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <!--<driver name="RunControlDriver" type="org.hps.util.RunControlDriver"/>-->
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<!-- <threshold>150</threshold>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
<!-- <dropBadFADC>true</dropBadFADC>-->
</driver>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.ecal.EcalEventMonitor">
+ <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
<eventRefreshRate>1000</eventRefreshRate>
</driver>
- <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.EcalWindowPlotsXY">
+ <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.EcalWindowPlotsXY">
<inputCollection>EcalReadoutHits</inputCollection>
</driver>
- <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
+ <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
@@ -59,19 +59,19 @@
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.EcalHitPlots">
+ <driver name="EcalHitPlots" type="org.hps.monitoring.drivers.ecal.EcalHitPlots">
<maxE>2.0</maxE>
<logScale>true</logScale>
</driver>
- <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.EcalClusterPlots">
+ <driver name="EcalClusterPlots" type="org.hps.monitoring.drivers.ecal.EcalClusterPlots">
<maxE>2.0</maxE>
<logScale>false</logScale>
</driver>
- <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX">
+ <driver name="EcalEvsX" type="org.hps.monitoring.drivers.ecal.EcalEvsX">
<targetZ>674</targetZ>
<inputCollection>EcalClusters</inputCollection>
</driver>
- <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
+ <driver name="TriggerPlots" type="org.hps.monitoring.drivers.ecal.TriggerPlots">
<clusterEnergyCut>0.500</clusterEnergyCut>
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -25,7 +25,7 @@
<!--<driver name="AidaSaveDriver"/>-->
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalReadoutToTriggerConverterDriver">
<rawCollectionName>EcalReadoutHits</rawCollectionName>
@@ -39,19 +39,19 @@
<inputCollection>EcalCalHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
<eventRefreshRate>1</eventRefreshRate>
</driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.ecal.EcalEventMonitor">
+ <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
<eventRefreshRate>1</eventRefreshRate>
</driver>
-<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
+<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>-->
- <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
+ <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<maxE>10000</maxE>
<eventRefreshRate>100</eventRefreshRate>
@@ -65,11 +65,11 @@
<clusterWindow>32.0</clusterWindow>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
</driver>
- <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.EcalHitPlots">
+ <driver name="EcalHitPlots" type="org.hps.monitoring.drivers.ecal.EcalHitPlots">
</driver>
- <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.EcalClusterPlots">
+ <driver name="EcalClusterPlots" type="org.hps.monitoring.drivers.ecal.EcalClusterPlots">
</driver>
- <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
+ <driver name="TriggerPlots" type="org.hps.monitoring.drivers.ecal.TriggerPlots">
<clusterEnergyCut>1280</clusterEnergyCut>
<eventRefreshRate>10000</eventRefreshRate>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -26,7 +26,7 @@
-->
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
<driver name="FADCConverter" type="org.hps.recon.ecal.FADCConverterDriver">
<threshold>80</threshold>
@@ -36,29 +36,29 @@
<integralWindow>35</integralWindow>
<gain>1.0</gain>
</driver>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
<inputCollection>EcalIntegralHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.ecal.EcalEventMonitor">
+ <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
<eventRefreshRate>1</eventRefreshRate>
</driver>
- <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.EcalWindowPlotsXY">
+ <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.EcalWindowPlotsXY">
<subdetectorName>Ecal</subdetectorName>
<inputCollection>EcalReadoutHits</inputCollection>
<window>100</window>
</driver>
- <driver name="EcalWindowEventPlots" type="org.hps.monitoring.ecal.EcalWindowEventPlots">
+ <driver name="EcalWindowEventPlots" type="org.hps.monitoring.drivers.ecal.EcalWindowEventPlots">
<inputCollection>EcalReadoutHits</inputCollection>
<window>100</window>
</driver>
-<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
+<!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>-->
- <driver name="EcalIntegralPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
+ <driver name="EcalIntegralPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>
@@ -71,11 +71,11 @@
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.EcalClusterPlots">
+ <driver name="EcalClusterPlots" type="org.hps.monitoring.drivers.ecal.EcalClusterPlots">
</driver>
- <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.EcalHitPlots">
+ <driver name="EcalHitPlots" type="org.hps.monitoring.drivers.ecal.EcalHitPlots">
</driver>
- <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX">
+ <driver name="EcalEvsX" type="org.hps.monitoring.drivers.ecal.EcalEvsX">
<inputCollection>EcalClusters</inputCollection>
</driver>
</drivers>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -49,39 +49,39 @@
</driver>
<driver name="SVTEventPlots"
- type="org.hps.monitoring.svt.SVTEventInfo">
+ type="org.hps.monitoring.drivers.svt.SVTEventInfo">
<outputPlots>svtEventInfoPlots.aida</outputPlots>
</driver>
<driver name="SVTHitRecoPlots"
- type="org.hps.monitoring.svt.SVTHitReconstructionPlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
<outputPlots>svtHitRecoPlots.aida</outputPlots>
</driver>
<driver name="SVTHitCorrPlots"
- type="org.hps.monitoring.svt.SVTHitRecoCorrelations">
+ 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.svt.SVTHitPulsePlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<outputPlots>svtPulsePlots.aida</outputPlots>
</driver>
- <driver name="SVTOccupancyPlots" type="org.hps.monitoring.svt.SensorOccupancyPlotsDriver">
+ <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<eventRefreshRate>100</eventRefreshRate>
</driver>
<driver name="SVTEventDisplay"
- type="org.hps.monitoring.svt.SVTEventDisplay">
+ type="org.hps.monitoring.drivers.svt.SVTEventDisplay">
</driver>
<driver name="SVTSetupDriver"
- type="org.hps.recon.tracking.HPSSVTSensorSetup">
+ type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
</driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
@@ -101,7 +101,7 @@
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -25,7 +25,7 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
@@ -57,7 +57,7 @@
type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
- <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.svt.SVTSimpleEventDisplay">
+ <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<inputCollection>SVTRawTrackerHits</inputCollection>
<singleEvent>false</singleEvent>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -26,11 +26,11 @@
<driver name="AidaSaveDriver"/>
</execute>
<drivers>
- <driver name="RunControlDriver" type="org.hps.monitoring.RunControlDriver"/>
+ <driver name="RunControlDriver" type="org.hps.util.RunControlDriver"/>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>17</runNumber> -->
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
@@ -54,30 +54,30 @@
</driver>
<driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+ <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<!-- <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->
</driver>
- <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.svt.SVTSimpleEventDisplay">
+ <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<inputCollection>SVTRawTrackerHits</inputCollection>
<singleEvent>false</singleEvent>
</driver>
- <driver name="SVTMonitoringPlots" type="org.hps.monitoring.svt.SVTMonitoringPlots">
+ <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
</driver>
<driver name="SVTPulseFitPlots"
- type="org.hps.monitoring.svt.SVTPulseFitPlots">
+ type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
<driver name="SVTPulsePlots"
- type="org.hps.monitoring.svt.SVTHitPulsePlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
</driver>
<driver name="SVTHitRecoPlots"
- type="org.hps.monitoring.svt.SVTHitReconstructionPlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
- <driver name="TrackTimePlots" type="org.hps.monitoring.svt.TrackTimePlots"/>
+ <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
@@ -85,4 +85,4 @@
<outputFileName>svtmon_plots2</outputFileName>
</driver>
</drivers>
-</lcsim>
\ No newline at end of file
+</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -9,8 +9,8 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="SVTSetupDriver" type="org.hps.recon.tracking.HPSSVTSensorSetup"/>
- <driver name="SVTOccupancyPlots" type="org.hps.monitoring.svt.SensorOccupancyPlotsDriver">
+ <driver name="SVTSetupDriver" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
+ <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<eventRefreshRate>1</eventRefreshRate>
</driver>
</drivers>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunEventDisplay.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -22,12 +22,12 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
- <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.svt.SVTSimpleEventDisplay">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
+ <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<singleEvent>true</singleEvent>
</driver>
<driver name="SVTEventDisplay"
- type="org.hps.monitoring.svt.SVTEventDisplay">
+ type="org.hps.monitoring.drivers.svt.SVTEventDisplay">
</driver>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
@@ -53,13 +53,13 @@
type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
</driver>
<driver name="CleanupDriver"
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.ecal.EcalEventMonitor">
+ <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
<eventRefreshRate>1</eventRefreshRate>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -28,7 +28,7 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
@@ -43,19 +43,19 @@
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"/>
- <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.drivers.ecal.EcalDaqPlots">
</driver>
<driver name="CleanupDriver"
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
<eventRefreshRate>100</eventRefreshRate>
</driver>
- <driver name="EcalEventMonitor" type="org.hps.monitoring.ecal.EcalEventMonitor">
+ <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
<eventRefreshRate>1</eventRefreshRate>
</driver>
- <driver name="SVTOccupancyPlots" type="org.hps.monitoring.svt.SensorOccupancyPlotsDriver">
+ <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<eventRefreshRate>100</eventRefreshRate>
</driver>
@@ -72,22 +72,22 @@
type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
- <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.svt.SVTSimpleEventDisplay">
+ <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
<inputCollection>SVTRawTrackerHits</inputCollection>
<singleEvent>false</singleEvent>
</driver>
<driver name="SVTPulsePlots"
- type="org.hps.monitoring.svt.SVTHitPulsePlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
</driver>
- <driver name="SVTMonitoringPlots" type="org.hps.monitoring.svt.SVTMonitoringPlots">
+ <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
</driver>
<driver name="SVTPulseFitPlots"
- type="org.hps.monitoring.svt.SVTPulseFitPlots">
+ type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
<driver name="SVTHitRecoPlots"
- type="org.hps.monitoring.svt.SVTHitReconstructionPlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
</drivers>
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TestRunMonitoringExample.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -19,7 +19,7 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalRawConverter"
type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
@@ -38,17 +38,17 @@
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
</driver>
- <driver name="SVTOccupancyPlots" type="org.hps.monitoring.svt.SensorOccupancyPlotsDriver">
+ <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<eventRefreshRate>10</eventRefreshRate>
</driver>
<driver name="SVTHitPulsePlots"
- type="org.hps.monitoring.svt.SVTHitPulsePlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
</driver>
- <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
</driver>
- <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.EcalHitPlots">
+ <driver name="EcalHitPlots" type="org.hps.monitoring.drivers.ecal.EcalHitPlots">
<maxE>2000</maxE>
<logScale>true</logScale>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -24,7 +24,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
<driver name="EcalEdepToTriggerConverterDriver" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
@@ -52,7 +52,7 @@
<driver name="SimpleSVTReadout" type="org.hps.recon.tracking.SimpleSvtReadout">
<noPileup>true</noPileup>
</driver>
- <driver name="ClockDriver" type="org.hps.util.ClockDriver"/>
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -31,7 +31,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
<driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
@@ -80,9 +80,9 @@
<triggerLatencyTime>240</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -95,7 +95,7 @@
<outputFileName>${outputFile}_triggerPlots</outputFileName>
</driver>-->
- <driver name="ClockDriver" type="org.hps.util.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>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -31,7 +31,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
@@ -80,9 +80,9 @@
<triggerLatencyTime>240</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -95,7 +95,7 @@
<outputFileName>${outputFile}_triggerPlots</outputFileName>
</driver>
- <driver name="ClockDriver" type="org.hps.util.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>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPSTrackingDefaults.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPSTrackingDefaults.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -17,7 +17,7 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/LcioToEvio.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/LcioToEvio.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -12,7 +12,7 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="DummyTrigger" type="org.hps.readout.ecal.DummyTriggerDriver">
<period>1</period>
@@ -22,7 +22,7 @@
<driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
<evioOutputFile>${outputFile}.evio</evioOutputFile>
</driver>
- <driver name="ClockDriver" type="org.hps.util.ClockDriver">
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver">
</driver>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunNoPileup.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -18,7 +18,7 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
@@ -49,7 +49,7 @@
<driver name="SimpleSVTReadout" type="org.hps.recon.tracking.SimpleSvtReadout">
<noPileup>true</noPileup>
</driver>
- <driver name="ClockDriver" type="org.hps.util.ClockDriver"/>
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -25,7 +25,7 @@
<!--<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver> -->
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
<driver name="TestRunReconToEvio" type="org.hps.evio.TestRunTriggeredReconToEvio">
@@ -74,9 +74,9 @@
<triggerLatencyTime>288</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -84,7 +84,7 @@
<numberOfSamplesToReadOut>6</numberOfSamplesToReadOut>
</driver>-->
- <driver name="ClockDriver" type="org.hps.util.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>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -29,7 +29,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>${runNumber}</runNumber>
</driver>
<driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
@@ -77,9 +77,9 @@
<triggerLatencyTime>288</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -87,7 +87,7 @@
<numberOfSamplesToReadOut>6</numberOfSamplesToReadOut>
</driver>-->
- <driver name="ClockDriver" type="org.hps.util.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>
java/trunk/steering-files/src/main/resources/org/hps/steering/readout
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunSim.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/TestRunSim.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -31,7 +31,7 @@
<drivers>
- <driver name="Calibrations" type="org.hps.conditions.CalibrationDriver">
+ <driver name="Calibrations" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
@@ -80,9 +80,9 @@
<triggerLatencyTime>288</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -115,7 +115,7 @@
<strategyResource> </strategyResource>
</driver>
- <driver name="ClockDriver" type="org.hps.util.ClockDriver" />
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver" />
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -35,7 +35,7 @@
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EventMarkerDriver"
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -19,7 +19,7 @@
<driver name="LCIOWriter"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>${runNumber}</runNumber>-->
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPSTrackingDefaultsRecon.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -22,7 +22,7 @@
<drivers>
<driver name="SVTBadChannelFilterDriver" type="org.hps.recon.tracking.SVTBadChannelFilterDriver"/>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -20,7 +20,7 @@
<driver name="LCIOWriter"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>${runNumber}</runNumber>
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
java/trunk/steering-files/src/main/resources/org/hps/steering/recon
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -14,7 +14,7 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>${runNumber}</runNumber>-->
</driver>
<driver name="EventMarkerDriver"
java/trunk/steering-files/src/main/resources/org/hps/steering/users
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/FakeHitTracking.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/FakeHitTracking.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -47,7 +47,7 @@
<eventInterval>1</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
<driver name="CreateHelixTracks" type="org.hps.users.phansson.ParticleHelixProducer">
@@ -67,7 +67,7 @@
<doHth>false</doHth>
</driver>
<driver name="TrackerDigiDriver"
- type="org.hps.users.meeg.SimpleTrackerDigiDriver">
+ type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
<readoutCollectionName>FakeTrackerHits</readoutCollectionName>
<debug>false</debug>
</driver>
@@ -86,11 +86,11 @@
<simTrackerHitCollectionName>FakeTrackerHits</simTrackerHitCollectionName>
</driver>
- <driver name="Digitization" type="org.hps.recon.tracking.RearTransitionModule" >
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" >
<noiseless>true</noiseless>
</driver>
- <driver name="DataProcessing" type="org.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>false</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -136,7 +136,7 @@
<hideFrame>false</hideFrame>
</driver>
- <driver name="ClockDriver" type="org.hps.util.ClockDriver" />
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver" />
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits FakeTrackerHits</collectionNames>
java/trunk/steering-files/src/main/resources/org/hps/steering/users
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/HPSTrackingBunchedMC.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -25,7 +25,7 @@
<drivers>
<driver name="SVTSetupDriver"
- type="org.hps.recon.tracking.HPSSVTSensorSetup">
+ type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
</driver>
<driver name="EventMarkerDriver"
java/trunk/steering-files/src/main/resources/org/hps/steering/users
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/OfflineTrackingAxial.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -38,25 +38,25 @@
type="org.hps.recon.tracking.DataTrackerHitDriver"/>
<driver name="SVTEventPlots"
- type="org.hps.monitoring.svt.SVTEventInfo">
+ type="org.hps.monitoring.drivers.svt.SVTEventInfo">
<outputPlots>svtEventInfoPlots.aida</outputPlots>
</driver>
<driver name="SVTHitRecoPlots"
- type="org.hps.monitoring.svt.SVTHitReconstructionPlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
<outputPlots>svtHitRecoPlots.aida</outputPlots>
</driver>
<driver name="SVTPulsePlots"
- type="org.hps.monitoring.svt.SVTHitPulsePlots">
+ type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<outputPlots>svtPulsePlots.aida</outputPlots>
</driver>
<driver name="SVTSetupDriver"
- type="org.hps.recon.tracking.HPSSVTSensorSetup">
+ type="org.hps.conditions.deprecated.HPSSVTSensorSetup">
</driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
@@ -76,7 +76,7 @@
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunOfflineReconSeeVertexingPlots.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -15,7 +15,7 @@
<driver name="TwoTrackAnalysis" />
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
@@ -46,7 +46,7 @@
<driver name="ElwinsVertexing" type="org.hps.users.mgraham.ElwinsTrackingRecon">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
<driver name="TwoTrackAnalysis" type="org.hps.users.mgraham.TwoTrackAnalysis">
java/trunk/steering-files/src/main/resources/org/hps/steering/users
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/TestRunPairTrigger.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -25,7 +25,7 @@
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<readoutCollection>EcalReadoutAnalogHits</readoutCollection>
@@ -63,7 +63,7 @@
<driver name="SimpleSVTReadout" type="org.hps.recon.tracking.SimpleSvtReadout">
<noPileup>true</noPileup>
</driver>
- <driver name="ClockDriver" type="org.hps.util.ClockDriver"/>
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
<driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
<hideFrame>true</hideFrame>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/EcalMonitoringCelentan.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/EcalMonitoringCelentan.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -36,16 +36,16 @@
<eventInterval>1</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<!-- <threshold>150</threshold>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
<!-- <dropBadFADC>true</dropBadFADC>-->
</driver>
- <!-- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">-->
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterIC">
+ <!-- <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>
@@ -76,26 +76,26 @@
<!-- Here are commented drivers -->
- <!--<driver name="RunControlDriver" type="org.lcsim.hps.monitoring.RunControlDriver"> -->
+ <!--<driver name="RunControlDriver" type="org.hps.util.RunControlDriver"> -->
- <!--<driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer"> -->
+ <!--<driver name="EcalClusterer" type="org.hps.recon.ecal.HPSEcalCTPClusterer"> -->
- <!-- <driver name="EcalEvsX" type="org.lcsim.hps.monitoring.ecal.EcalEvsX">
+ <!-- <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX">
<targetZ>674</targetZ>
<inputCollection>EcalClusters</inputCollection>
</driver> -->
- <!-- <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.plots.EcalWindowPlots">
+ <!-- <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.plots.EcalWindowPlots">
<inputCollection>EcalReadoutHits</inputCollection>
</driver> -->
- <!-- <driver name="EcalPedestalPlots" type="org.lcsim.hps.monitoring.ecal.EcalPedestalPlots">
+ <!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
<inputCollection>EcalCalHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
</driver>-->
- <!-- <driver name="TriggerPlots" type="org.lcsim.hps.monitoring.ecal.TriggerPlots">
+ <!-- <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
<clusterEnergyCut>0.500</clusterEnergyCut>
</driver>-->
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalCalibration.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -17,20 +17,20 @@
-->
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
</driver>
- <driver name="EcalMonitoringPlots" type="org.lcsim.hps.monitoring.ecal.EcalMonitoringPlots">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots">
<eventRefreshRate>100</eventRefreshRate>
</driver>
- <driver name="EcalEventMonitor" type="org.lcsim.hps.monitoring.ecal.EcalEventMonitor">
+ <driver name="EcalEventMonitor" type="org.hps.monitoring.drivers.ecal.EcalEventMonitor">
<eventRefreshRate>1</eventRefreshRate>
</driver>
- <driver name="EcalWindowPlots" type="org.lcsim.hps.monitoring.ecal.EcalWindowPlotsXY">
+ <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.EcalWindowPlotsXY">
<inputCollection>EcalReadoutHits</inputCollection>
</driver>
- <driver name="EcalPedestalPlots" type="org.lcsim.hps.monitoring.ecal.EcalPedestalPlots">
+ <driver name="EcalPedestalPlots" type="org.hps.monitoring.ecal.EcalPedestalPlots">
<inputCollection>EcalReadoutHits</inputCollection>
<eventRefreshRate>100</eventRefreshRate>
<calWindow>5</calWindow>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalScoring.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalScoring.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -17,7 +17,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="ECalScoringMatch" type="org.lcsim.hps.examples.ECalScoringMatchDriver"/>
+ <driver name="ECalScoringMatch" type="org.hps.analysis.examples.ECalScoringMatchDriver"/>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriver.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -24,36 +24,36 @@
</execute>
<drivers>
- <driver name="SVTBadChannelFilterDriver" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver"/>
+ <driver name="SVTBadChannelFilterDriver" type="org.hps.recon.tracking.SVTBadChannelFilterDriver"/>
<driver name="EcalGainDriver"
- type="org.lcsim.hps.users.phansson.ECalGainDriver">
+ type="org.hps.users.phansson.ECalGainDriver">
<debug>false</debug>
<hideFrame>true</hideFrame>
<outputPlotFileName>gaindriver.aida</outputPlotFileName>
<ecalGainFileName>clusterlist.txt</ecalGainFileName>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EcalRawConverter"
- type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
+ type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.EcalClusterer">
+ type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="RawTrackerHitFitterDriver"
- type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ type="org.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<!-- <fitAlgorithm>Dumb</fitAlgorithm> -->
<fitAlgorithm>Analytic</fitAlgorithm>
</driver>
<driver name="TrackerHitDriver"
- type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver"/>
+ type="org.hps.recon.tracking.DataTrackerHitDriver"/>
<driver name="CleanupDriver"
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits</collectionNames>
@@ -62,17 +62,17 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
<driver name="LCIOWriter"
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/EcalGainDriverSim.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -24,7 +24,7 @@
</execute>
<drivers>
<driver name="EcalGainDriver"
- type="org.lcsim.hps.users.phansson.ECalGainDriver">
+ type="org.hps.users.phansson.ECalGainDriver">
<debug>false</debug>
<hideFrame>true</hideFrame>
<outputPlotFileName>gaindriver_sim.aida</outputPlotFileName>
@@ -32,24 +32,24 @@
<simTrigger>true</simTrigger>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
<addNoise>true</addNoise>
</driver>
- <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.EcalTriggerFilterDriver">
+ <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalTriggerHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
<driver name="EcalTriggerClusterer"
- type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
+ type="org.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.EcalClusterer">
+ type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
@@ -57,17 +57,17 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="TrackerDigiDriver"
- type="org.lcsim.hps.recon.tracking.SimpleTrackerDigiDriver">
+ type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
<debug>false</debug>
</driver>
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/FADCSignalAnalysis.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -30,39 +30,39 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
- <driver name="TestRunReconToLcio" type="org.lcsim.hps.evio.TestRunTriggeredReconToLcio">
+ <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
</driver>
- <driver name="EcalReadout" type="org.lcsim.hps.users.gcharles.FADCSignalAnalysis">
+ <driver name="EcalReadout" type="org.hps.users.gcharles.FADCSignalAnalysis">
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>8.0</clusterWindow>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
- <driver name="EcalTrigger" type="org.lcsim.hps.readout.ecal.FADCTriggerDriver">
+ <driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
<outputFileName>${outputFile}.triggers</outputFileName>
</driver>
- <driver name="SimpleSVTReadout" type="org.lcsim.hps.recon.tracking.SimpleSvtReadout">
+ <driver name="SimpleSVTReadout" type="org.hps.recon.tracking.SimpleSvtReadout">
</driver>
-<!-- <driver name="SVTReadout" type="org.lcsim.hps.recon.tracking.apv25.SvtReadout">
+<!-- <driver name="SVTReadout" type="org.hps.recon.tracking.apv25.SvtReadout">
<debug>false</debug>
<pedestalRun>false</pedestalRun>
<triggerLatencyTime>240</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.lcsim.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.lcsim.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -75,7 +75,7 @@
<outputFileName>${outputFile}_triggerPlots</outputFileName>
</driver>
- <driver name="ClockDriver" type="org.lcsim.hps.util.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>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/HitTimes.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/HitTimes.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -9,6 +9,6 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="HitTimePrintDriver" type="org.lcsim.hps.users.meeg.HitTimePrintDriver"/>
+ <driver name="HitTimePrintDriver" type="org.hps.users.meeg.HitTimePrintDriver"/>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/SVTPedestals.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/SVTPedestals.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -11,12 +11,12 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>17</runNumber> -->
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="PedestalPlots"
- type="org.lcsim.hps.monitoring.svt.PedestalPlots">
+ type="org.hps.monitoring.drivers.svt.PedestalPlots">
<fitFile>${outputFile}_pedestals.txt</fitFile>
<plotTimeSeries>true</plotTimeSeries>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ecal_fadc_bkgd.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -24,13 +24,13 @@
<driver name="ClockDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="Writer"
type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}_ecalClusters</outputFilePath>
</driver>
<driver name="EcalReadout"
- type="org.lcsim.hps.readout.ecal.FADCEcalReadoutDriver">
+ type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<readoutPeriod>4.0</readoutPeriod>
<coincidenceWindow>2</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -42,37 +42,37 @@
<fixedGain>0.15</fixedGain>
</driver>
<driver name="EcalConverter"
- type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
+ type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<gain>0.15</gain>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
+ type="org.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
<driver name="EcalTrigger"
- type="org.lcsim.hps.readout.ecal.FADCTriggerDriver">
+ type="org.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<outputFileName>${outputFile}.triggers</outputFileName>
<deadTime>10</deadTime>
</driver>
<driver name="EcalPlots"
- type="org.lcsim.hps.analysis.ecal.HPSEcalPlotsDriver">
+ type="org.hps.analysis.ecal.HPSEcalPlotsDriver">
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
</driver>
<driver name="EcalFADCPlots"
- type="org.lcsim.hps.analysis.ecal.HPSEcalFADCPlotsDriver">
+ type="org.hps.analysis.ecal.HPSEcalFADCPlotsDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<edepThreshold>0.05</edepThreshold>
</driver>
<driver name="EcalTriggerPlots"
- type="org.lcsim.hps.analysis.ecal.HPSEcalTriggerPlotsDriver">
+ type="org.hps.analysis.ecal.HPSEcalTriggerPlotsDriver">
</driver>
<driver name="MCParticlePlots"
- type="org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver">
+ type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
</driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
@@ -83,7 +83,7 @@
<outputFileName>${outputFile}_ecalPlots</outputFileName>
</driver>
<driver name="ClockDriver"
- type="org.lcsim.hps.util.ClockDriver">
+ type="org.hps.readout.ecal.ClockDriver">
</driver>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -11,9 +11,9 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalIDPrint" type="org.lcsim.hps.monitoring.ecal.ECalCellIDPrintDriver"/>
- <driver name="SVTDataIDPrint" type="org.lcsim.hps.monitoring.svt.SVTCellIDPrintDriver"/>
- <driver name="SVTIDPrint" type="org.lcsim.hps.monitoring.svt.SVTCellIDPrintDriver">
+ <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>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/raw_triggers.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -18,20 +18,20 @@
<driver name="ClockDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.EcalClusterer">
+ type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalHits</ecalCollectionName>
<addEMin>0.075</addEMin>
</driver>
<driver name="EcalTrigger"
- type="org.lcsim.hps.analysis.ecal.TestRunRateAnalysis">
+ type="org.hps.analysis.ecal.TestRunRateAnalysis">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<clusterEnergyLow>0.6</clusterEnergyLow>
</driver>
<driver name="MCParticlePlots"
- type="org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver">
+ type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver">
</driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
@@ -42,7 +42,7 @@
<outputFileName>${inputFile}_ecalPlots</outputFileName>
</driver>
<driver name="ClockDriver"
- type="org.lcsim.hps.util.ClockDriver">
+ type="org.hps.readout.ecal.ClockDriver">
</driver>
</drivers>
</lcsim>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/HitTimeStudies.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/HitTimeStudies.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -16,7 +16,7 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>${runNumber}</runNumber>-->
</driver>
<driver name="EventMarkerDriver"
@@ -24,33 +24,33 @@
<eventInterval>1</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>false</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver" />
- <driver name="HitTimeDriver" type="org.lcsim.hps.users.mgraham.HitTimePlotter" />
-<!-- <driver name="HitTimeDriver" type="org.lcsim.hps.users.meeg.HitTimePrintDriver" /> -->
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="HitTimeDriver" type="org.hps.users.mgraham.HitTimePlotter" />
+<!-- <driver name="HitTimeDriver" type="org.hps.users.meeg.HitTimePrintDriver" /> -->
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver">
+ type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
<clusterTimeCut>4.0</clusterTimeCut>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
<driver name="TrackerReconDriver"
- type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>true</debug>
</driver>
- <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">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="ReconParticle" type="org.lcsim.hps.recon.particle.ReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.ReconParticleDriver">
</driver>
<!--
<driver name="LCIOWriter"
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/ReconParticleBuilder.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/ReconParticleBuilder.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -14,7 +14,7 @@
<driver name="LCIOWriter"/>
</execute>
<drivers>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>${runNumber}</runNumber>-->
</driver>
<driver name="EventMarkerDriver"
@@ -22,30 +22,30 @@
<eventInterval>1</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
</driver>
- <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">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="ReconParticle" type="org.lcsim.hps.recon.particle.ReconParticleDriver">
+ <driver name="ReconParticle" type="org.hps.recon.particle.ReconParticleDriver">
</driver>
<driver name="LCIOWriter"
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPS2014DumpEcal.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -24,12 +24,12 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
</driver>
- <driver name="EcalReadout" type="org.lcsim.hps.readout.ecal.FADCEcalReadoutDriver">
+ <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<readoutPeriod>4.0</readoutPeriod>
<coincidenceWindow>2</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -43,7 +43,7 @@
<!-- <debug>true</debug>-->
</driver>
- <driver name="EcalConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
+ <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<!-- <gain>0.15</gain>-->
@@ -52,7 +52,7 @@
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>8.0</clusterWindow>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
@@ -60,7 +60,7 @@
- <driver name="EcalTriggerVariables" type="org.lcsim.hps.readout.ecal.FADCTriggerVariableDriver">
+ <driver name="EcalTriggerVariables" type="org.hps.readout.ecal.FADCTriggerVariableDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<outputFileName>${outputFile}.txt</outputFileName>
</driver>
@@ -69,7 +69,7 @@
- <driver name="ClockDriver" type="org.lcsim.hps.util.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>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -26,13 +26,13 @@
<drivers>
<driver name="GBLDriver"
- type="org.lcsim.hps.recon.tracking.gbl.GBLOutputDriver">
+ type="org.hps.recon.tracking.gbl.GBLOutputDriver">
<debug>0</debug>
<hideFrame>false</hideFrame>
<outputPlotFileName></outputPlotFileName>
<gblFileName>gblinput.txt</gblFileName>
</driver>
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
@@ -41,20 +41,20 @@
<eventInterval>100</eventInterval>
</driver>
- <driver name="TrackerDigiDriver" type="org.lcsim.hps.users.meeg.SimpleTrackerDigiDriver">
+ <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
<!-- <dropBadChannels>true</dropBadChannels>-->
<debug>false</debug>
</driver>
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MPAlignment.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MPAlignment.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -33,7 +33,7 @@
<drivers>
<driver name="MPAlignment"
- type="org.lcsim.hps.users.phansson.RunMPAlignment">
+ type="org.hps.users.phansson.RunMPAlignment">
<residualLimitFileName>/Users/phansson/work/HPS/software/reco/hps-java/src/main/java/org/lcsim/hps/users/phansson/residualLimits.txt</residualLimitFileName>
<debug>true</debug>
<hideFrame>false</hideFrame>
@@ -41,19 +41,19 @@
<outputPlotFileName></outputPlotFileName>
</driver>
<driver name="TruthMomentumAnalysis"
- type="org.lcsim.hps.users.phansson.TruthMomentumResolutionDriver">
+ type="org.hps.users.phansson.TruthMomentumResolutionDriver">
<hideFrame>false</hideFrame>
<debug>false</debug>
</driver>
- <driver name="MCParticlePlots" type="org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
- <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
<driver name="CleanupDriver"
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
</driver>
- <driver name="HelicalTrackHitResidualsDriver" type="org.lcsim.hps.recon.tracking.HelicalTrackHitResidualsDriver">
+ <driver name="HelicalTrackHitResidualsDriver" type="org.hps.recon.tracking.HelicalTrackHitResidualsDriver">
<debug>false</debug>
<hideFrame>false</hideFrame>
</driver>
@@ -63,7 +63,7 @@
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EventMarkerDriver"
@@ -71,27 +71,27 @@
<eventInterval>1000</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<includeMS>true</includeMS>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
</driver>
- <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">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
@@ -116,7 +116,7 @@
<driver name="EcalReadout"
- type="org.lcsim.hps.recon.ecal.HPSEcalFADCReadoutDriver">
+ type="org.hps.recon.ecal.HPSEcalFADCReadoutDriver">
<readoutPeriod>4.0</readoutPeriod>
<coincidenceWindow>2</coincidenceWindow>
<ecalName>Ecal</ecalName>
@@ -127,41 +127,41 @@
</driver>
<driver name="EcalConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalConverterDriver">
+ type="org.hps.recon.ecal.HPSEcalConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<scale>1</scale>
</driver>
- <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">
+ <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.HPSEcalTriggerFilterDriver">
<inputCollection>EcalCorrectedHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
<driver name="EcalCTPClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
+ type="org.hps.recon.ecal.HPSEcalCTPClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>32.0</clusterWindow>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
</driver>
<driver name="EcalTrigger"
- type="org.lcsim.hps.recon.ecal.TestRunTriggerDriver">
+ type="org.hps.recon.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
</driver>
- <driver name="SimpleSVTReadout" type="org.lcsim.hps.recon.tracking.SimpleSvtReadout">
+ <driver name="SimpleSVTReadout" type="org.hps.recon.tracking.SimpleSvtReadout">
</driver>
- <driver name="SVTReadout" type="org.lcsim.hps.recon.tracking.apv25.SvtReadout">
+ <driver name="SVTReadout" type="org.hps.recon.tracking.apv25.SvtReadout">
<debug>false</debug>
<pedestalRun>false</pedestalRun>
<triggerLatencyTime>288</triggerLatencyTime>
</driver>
- <driver name="Digitization" type="org.lcsim.hps.recon.tracking.RearTransitionModule" />
+ <driver name="Digitization" type="org.hps.recon.tracking.apv25.RearTransitionModule" />
- <driver name="DataProcessing" type="org.lcsim.hps.recon.tracking.TestRunDataProcessingModule" >
+ <driver name="DataProcessing" type="org.hps.recon.tracking.apv25.TestRunDataProcessingModule" >
<enablePileUpCut>true</enablePileUpCut>
<enableThresholdCut>true</enableThresholdCut>
<noiseThreshold>2</noiseThreshold>
@@ -170,10 +170,10 @@
</driver>
<driver name="ClockDriver"
- type="org.lcsim.hps.util.ClockDriver">
+ type="org.hps.readout.ecal.ClockDriver">
</driver>
- <driver name="TestRunReconToLcio" type="org.lcsim.hps.evio.TestRunTriggeredReconToLcio">
+ <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<!--<outputFile>${outputFile}</outputFile>-->
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MultScatAna.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/MultScatAna.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -37,38 +37,38 @@
<driver name="MultScatAnaDriver"
- type="org.lcsim.hps.users.phansson.MultScatAnalysis">
+ type="org.hps.users.phansson.MultScatAnalysis">
<debug>false</debug>
<outputPlotFileName>multscatana.aida</outputPlotFileName>
</driver>
<driver name="TrigRateDriver"
- type="org.lcsim.hps.users.phansson.TrigRateDriver">
+ type="org.hps.users.phansson.TrigRateDriver">
<debug>false</debug>
<hideFrame>false</hideFrame>
<outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/trigratefile.aida</outputPlotFileName>
</driver>
<!-- <driver name="GainCalibrationDriver"
- type="org.lcsim.hps.recon.ecal.GainCalibrationDriver">
+ type="org.hps.recon.ecal.GainCalibrationDriver">
<debug>false</debug>
<hideFrame>true</hideFrame>
<outputPlotFileName>gaincalib.aida</outputPlotFileName>
<ecalGainFileName></ecalGainFileName>
<ecalGainCalibCorrFileName>gaincalibout.txt</ecalGainCalibCorrFileName>
</driver>-->
- <driver name="EcalDaqPlots" type="org.lcsim.hps.monitoring.ecal.EcalDaqPlots">
+ <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
</driver>
<driver name="CleanupDriver"
type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
<collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
</driver>
- <driver name="EcalMonitoringPlots" type="org.lcsim.hps.monitoring.ecal.EcalMonitoringPlots"/>
- <driver name="SVTOccupancyPlots" type="org.lcsim.hps.monitoring.svt.SensorOccupancyPlotsDriver">
+ <driver name="EcalMonitoringPlots" type="org.hps.monitoring.drivers.ecal.EcalMonitoringPlots"/>
+ <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
<eventRefreshRate>1</eventRefreshRate>
</driver>
- <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots>trackingPlots.aida</outputPlots>
</driver>
@@ -79,7 +79,7 @@
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EventMarkerDriver"
@@ -87,26 +87,26 @@
<eventInterval>100</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>true</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
</driver>
- <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">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim 2014-03-26 06:16:27 UTC (rev 383)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim 2014-03-26 07:16:25 UTC (rev 384)
@@ -33,7 +33,7 @@
<drivers>
<driver name="GBLDriver"
- type="org.lcsim.hps.recon.tracking.gbl.GBLOutputDriver">
+ type="org.hps.recon.tracking.gbl.GBLOutputDriver">
<debug>0</debug>
<hideFrame>false</hideFrame>
<isMC>${isMC}</isMC>
@@ -41,7 +41,7 @@
<gblFileName>gblinput.txt</gblFileName>
</driver>
<driver name="ROOTFlatTupleDriver"
- type="org.lcsim.hps.users.phansson.ROOTFlatTupleDriver">
+ type="org.hps.users.phansson.ROOTFlatTupleDriver">
<debug>false</debug>
<hideFrame>true</hideFrame>
<outputPlotFileName></outputPlotFileName>
@@ -50,15 +50,15 @@
<targetPosition>-670.</targetPosition>
</driver>
<driver name="TruthMomentumAnalysis"
- type="org.lcsim.hps.users.phansson.TruthMomentumResolutionDriver">
+ type="org.hps.users.phansson.TruthMomentumResolutionDriver">
<hideFrame>false</hideFrame>
<debug>false</debug>
</driver>
- <driver name="MCParticlePlots" type="org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
- <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
+ <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
+ <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
<outputPlots></outputPlots>
</driver>
- <driver name="PrintGeometryDriver" type="org.lcsim.hps.util.PrintGeometryDriver"/>
+ <driver name="PrintGeometryDriver" type="org.hps.util.PrintGeometryDriver"/>
@@ -68,7 +68,7 @@
- <driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
<runNumber>${runNumber}</runNumber>
<!-- <gainFilename>default_goodregion_shift_v1.gain</gainFilename> -->
</driver>
@@ -77,27 +77,27 @@
<eventInterval>100</eventInterval>
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="BadChannelFilter" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver" />
- <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
<fitAlgorithm>Analytic</fitAlgorithm>
<correctT0Shift>false</correctT0Shift>
</driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
<driver name="HelicalTrackHitDriver"
- type="org.lcsim.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.lcsim.hps.recon.tracking.TrackerReconDriver">
+ type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
</driver>
- <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">
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
SVNspam 0.1
