Commit in hps-java/src/main on MAIN | |||
resources/org/lcsim/hps/steering/HPSTrackingDefaultsRecon.lcsim | +53 | added 1.1 | |
/ecal_fadc_bkgd.lcsim | +1 | -3 | 1.11 -> 1.12 |
/raw_triggers.lcsim | +1 | -3 | 1.1 -> 1.2 |
/EcalGainDriver.lcsim | +5 | -10 | 1.5 -> 1.6 |
/HPSTestRunReconToLcio.lcsim | -2 | 1.4 -> 1.5 | |
/ECalCalibration.lcsim | -11 | 1.3 -> 1.4 | |
/ECalMonitoring.lcsim | -3 | 1.12 -> 1.13 | |
/EcalGainDriverSim.lcsim | +4 | -7 | 1.3 -> 1.4 |
/TestRunOfflineRecon.lcsim | -1 | 1.6 -> 1.7 | |
/SVTMonitoring.lcsim | +4 | -8 | 1.3 -> 1.4 |
/HPSTrackingDefaults.lcsim | +10 | -13 | 1.7 -> 1.8 |
/HPSTestRunReconToEvio.lcsim | -4 | 1.14 -> 1.15 | |
/HPSTestRunFastSimToEvio.lcsim | -94 | 1.1 removed | |
java/org/lcsim/hps/recon/tracking/LoadCalibrationsDriver.java | -21 | 1.1 removed | |
java/org/lcsim/hps/monitoring/HPSCalibrationListener.java | +24 | -10 | 1.5 -> 1.6 |
/HPSCalibrationDriver.java | +18 | -18 | 1.6 -> 1.7 |
java/org/lcsim/hps/recon/ecal/HPSEcalReadoutToTriggerConverterDriver.java | +1 | -1 | 1.2 -> 1.3 |
java/org/lcsim/hps/evio/TestRunTriggeredReconToEvio.java | +1 | -1 | 1.19 -> 1.20 |
/EventConstants.java | +1 | 1.14 -> 1.15 | |
+123 | -210 |
unbreak calibrations drivers
diff -N HPSTrackingDefaultsRecon.lcsim --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ HPSTrackingDefaultsRecon.lcsim 27 Aug 2012 22:42:19 -0000 1.1 @@ -0,0 +1,53 @@
+ +<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" + xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> + + <control> + <printInputFiles>true</printInputFiles> + <printDriversDetailed>true</printDriversDetailed> + </control> + + <execute> + <driver name="EventMarkerDriver"/> + <driver name="HPSCalibrationDriver"/> + <driver name="SVTBadChannelFilterDriver"/> + <driver name="RawTrackerHitFitterDriver" /> + <driver name="TrackerHitDriver" /> + <driver name="TrackerReconDriver"/> + <driver name="LCIOWriter"/> + </execute> + + <drivers> + <driver name="SVTBadChannelFilterDriver" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver"/> + + <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"> +<!-- <runNumber>1351</runNumber> --> + </driver> + + <driver name="EventMarkerDriver" + type="org.lcsim.job.EventMarkerDriver"> + <eventInterval>1000</eventInterval> + </driver> + + <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> + <fitAlgorithm>Analytic</fitAlgorithm> + <correctT0Shift>true</correctT0Shift> + </driver> + + <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> + + <driver name="TrackerReconDriver" + type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> + <debug>false</debug> + <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource> + <stripMaxSeparation>20.0</stripMaxSeparation> + <stripTolerance>1.0</stripTolerance> + </driver> + + <driver name="LCIOWriter" + type="org.lcsim.util.loop.LCIODriver"> + <outputFilePath>${outputFile}</outputFilePath> + </driver> + + </drivers> +</lcsim>
diff -u -r1.11 -r1.12 --- ecal_fadc_bkgd.lcsim 30 Jul 2012 22:30:04 -0000 1.11 +++ ecal_fadc_bkgd.lcsim 27 Aug 2012 22:42:19 -0000 1.12 @@ -1,7 +1,7 @@
<!-- Example LCSim steering file to run trigger rate studies @author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_fadc_bkgd.lcsim,v 1.11 2012/07/30 22:30:04 meeg Exp $
+ @version $Id: ecal_fadc_bkgd.lcsim,v 1.12 2012/08/27 22:42:19 meeg Exp $
--> <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -16,7 +16,6 @@
<jar>~/.m2/repository/org/lcsim/hps-java/1.0-SNAPSHOT/hps-java-1.0-SNAPSHOT.jar</jar> </classpath> <execute>
- <driver name="LoadCalibrations"/>
<driver name="HPSCalibrationDriver"/> <driver name="EventMarkerDriver"/> <driver name="EcalReadout"/>
@@ -32,7 +31,6 @@
<driver name="ClockDriver"/> </execute> <drivers>
- <driver name="LoadCalibrations" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver" />
<driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> <driver name="Writer" type="org.lcsim.util.loop.LCIODriver">
diff -u -r1.1 -r1.2 --- raw_triggers.lcsim 30 Jul 2012 22:30:04 -0000 1.1 +++ raw_triggers.lcsim 27 Aug 2012 22:42:19 -0000 1.2 @@ -1,7 +1,7 @@
<!-- steering file used for PAC 39 analysis @author Sho Uemura <[log in to unmask]>
- @version $Id: raw_triggers.lcsim,v 1.1 2012/07/30 22:30:04 meeg Exp $
+ @version $Id: raw_triggers.lcsim,v 1.2 2012/08/27 22:42:19 meeg Exp $
--> <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -16,7 +16,6 @@
<jar>~/.m2/repository/org/lcsim/hps-java/1.0-SNAPSHOT/hps-java-1.0-SNAPSHOT.jar</jar> </classpath> <execute>
-<!-- <driver name="LoadCalibrations"/>-->
<!-- <driver name="HPSCalibrationDriver"/> --> <!-- <driver name="EventMarkerDriver"/>--> <driver name="EcalClusterer"/>
@@ -26,7 +25,6 @@
<driver name="ClockDriver"/> </execute> <drivers>
- <driver name="LoadCalibrations" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver" />
<driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
diff -u -r1.5 -r1.6 --- EcalGainDriver.lcsim 24 Aug 2012 01:02:27 -0000 1.5 +++ EcalGainDriver.lcsim 27 Aug 2012 22:42:19 -0000 1.6 @@ -8,18 +8,13 @@
<execute> <driver name="EventMarkerDriver"/> <driver name="HPSCalibrationDriver"/>
- <driver name="SVTBadChannelFilterDriver"/>
+<!-- <driver name="SVTBadChannelFilterDriver"/>-->
<driver name="EcalRawConverter"/> <driver name="EcalClusterer"/>
- <driver name="RawTrackerHitFitterDriver"/> - <driver name="TrackerHitDriver"/> - <driver name="TrackerReconDriver"/>
+<!-- <driver name="RawTrackerHitFitterDriver"/> --> +<!-- <driver name="TrackerHitDriver"/> --> +<!-- <driver name="TrackerReconDriver"/>-->
-<!-- - <driver name="SVTOccupancyPlots"/> - <driver name="TrackingReconstructionPlots"/> - <driver name="EcalMonitoringPlots"/> --->
<driver name="EcalGainDriver"/> <!-- <driver name="CleanupDriver"/>-->
@@ -40,7 +35,7 @@
</driver> <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
+ <runNumber>1351</runNumber>
</driver> <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
diff -u -r1.4 -r1.5 --- HPSTestRunReconToLcio.lcsim 21 Aug 2012 01:06:51 -0000 1.4 +++ HPSTestRunReconToLcio.lcsim 27 Aug 2012 22:42:19 -0000 1.5 @@ -4,7 +4,6 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <execute>
- <driver name="LoadCalibrations"/>
<driver name="HPSCalibrationDriver"/> <driver name="EcalReadout"/> <driver name="EcalConverter"/>
@@ -17,7 +16,6 @@
</execute> <drivers>
- <driver name="LoadCalibrations" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver" />
<driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> <driver name="TestRunReconToLcio" type="org.lcsim.hps.evio.TestRunTriggeredReconToLcio"> <outputFile>${outputFile}</outputFile>
diff -u -r1.3 -r1.4 --- ECalCalibration.lcsim 18 May 2012 07:41:49 -0000 1.3 +++ ECalCalibration.lcsim 27 Aug 2012 22:42:19 -0000 1.4 @@ -12,18 +12,14 @@
<driver name="EcalPedestalPlots"/> <!-- <driver name="EcalRawConverter"/>--> <!--
- <driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/> <driver name="EcalEventMonitor"/>
- <driver name="EcalEvsX"/>
<driver name="EcalWindowPlots"/>
- <driver name="EcalDaqPlots"/>
--> </execute> <drivers> <driver name="HPSEcalConditions" type="org.lcsim.hps.recon.ecal.HPSEcalConditions"/> <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
- <integralWindow>35</integralWindow>
</driver> <driver name="EcalMonitoringPlots" type="org.lcsim.hps.monitoring.ecal.EcalMonitoringPlots"> <eventRefreshRate>100</eventRefreshRate>
@@ -32,9 +28,7 @@
<eventRefreshRate>1</eventRefreshRate> </driver> <driver name="EcalWindowPlots" type="org.lcsim.hps.monitoring.ecal.EcalWindowPlotsXY">
- <subdetectorName>Ecal</subdetectorName>
<inputCollection>EcalReadoutHits</inputCollection>
- <window>100</window>
</driver> <driver name="EcalPedestalPlots" type="org.lcsim.hps.monitoring.ecal.EcalPedestalPlots"> <inputCollection>EcalReadoutHits</inputCollection>
@@ -45,10 +39,5 @@
type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver>
- <driver name="EcalClusterer" - type="org.lcsim.hps.recon.ecal.HPSEcalClusterer"> - <ecalName>Ecal</ecalName> - <ecalCollectionName>EcalCalHits</ecalCollectionName> - </driver>
</drivers> </lcsim>
diff -u -r1.12 -r1.13 --- ECalMonitoring.lcsim 9 Aug 2012 00:51:15 -0000 1.12 +++ ECalMonitoring.lcsim 27 Aug 2012 22:42:19 -0000 1.13 @@ -26,7 +26,6 @@
<drivers> <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
- <integralWindow>35</integralWindow>
<!-- <threshold>150</threshold>--> <applyBadCrystalMap>false</applyBadCrystalMap> <!-- <dropBadFADC>true</dropBadFADC>-->
@@ -41,9 +40,7 @@
<eventRefreshRate>1</eventRefreshRate> </driver> <driver name="EcalWindowPlots" type="org.lcsim.hps.monitoring.ecal.EcalWindowPlotsXY">
- <subdetectorName>Ecal</subdetectorName>
<inputCollection>EcalReadoutHits</inputCollection>
- <window>100</window>
</driver> <driver name="EcalPedestalPlots" type="org.lcsim.hps.monitoring.ecal.EcalPedestalPlots"> <inputCollection>EcalCalHits</inputCollection>
diff -u -r1.3 -r1.4 --- EcalGainDriverSim.lcsim 24 Aug 2012 01:02:27 -0000 1.3 +++ EcalGainDriverSim.lcsim 27 Aug 2012 22:42:19 -0000 1.4 @@ -1,9 +1,6 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
- <inputFiles> - <file>${inputFile}</file> - </inputFiles>
<control> <printInputFiles>true</printInputFiles> <printDriversDetailed>true</printDriversDetailed>
@@ -12,14 +9,14 @@
<driver name="EventMarkerDriver"/> <!-- <driver name="Timer1"/>--> <driver name="HPSCalibrationDriver"/>
- <driver name="SVTBadChannelFilterDriver"/>
+<!-- <driver name="SVTBadChannelFilterDriver"/>-->
<driver name="EcalRawConverter"/> <driver name="EcalClusterer"/> <driver name="EcalTriggerFilter"/> <driver name="EcalTriggerClusterer"/>
- <driver name="TrackerDigiDriver"/>
+<!-- <driver name="TrackerDigiDriver"/>-->
<!-- <driver name="Timer2"/>-->
- <driver name="TrackerReconDriver"/>
+<!-- <driver name="TrackerReconDriver"/>-->
<!-- <driver name="Timer3"/>--> <driver name="EcalGainDriver"/>
@@ -52,7 +49,7 @@
</driver> <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
-<!-- <runNumber>1351</runNumber> -->
+ <runNumber>1351</runNumber>
</driver> <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalEdepToTriggerConverterDriver"> </driver>
diff -u -r1.6 -r1.7 --- TestRunOfflineRecon.lcsim 21 Aug 2012 01:06:51 -0000 1.6 +++ TestRunOfflineRecon.lcsim 27 Aug 2012 22:42:19 -0000 1.7 @@ -26,7 +26,6 @@
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug>
- <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
<stripMaxSeparation>20.0</stripMaxSeparation> <stripTolerance>1.0</stripTolerance> </driver>
diff -u -r1.3 -r1.4 --- SVTMonitoring.lcsim 16 Aug 2012 22:01:30 -0000 1.3 +++ SVTMonitoring.lcsim 27 Aug 2012 22:42:19 -0000 1.4 @@ -6,11 +6,11 @@
<driver name="SVTPulsePlots"/> <driver name="RawTrackerHitFitterDriver" />
-<!-- <driver name="SVTPulseFitPlots"/> - <driver name="SVTMonitoringPlots"/>-->
+ <driver name="SVTPulseFitPlots"/> +<!-- <driver name="SVTMonitoringPlots"/>-->
<driver name="TrackerHitDriver" />
-<!-- <driver name="SVTHitRecoPlots"/>-->
+ <driver name="SVTHitRecoPlots"/>
<!-- <driver name="TrackerReconDriver" /> <driver name="SVTSimpleEventDisplay"/>
@@ -21,7 +21,6 @@
<driver name="TrackingReconstructionPlots" />--> <driver name="CleanupDriver" />
- <driver name="LoadCalibrationsDriver"/>
</execute> <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
@@ -36,15 +35,13 @@
<ecalCollectionName>EcalCalHits</ecalCollectionName> </driver> <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
- <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName> - <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
<fitAlgorithm>Analytic</fitAlgorithm> <correctT0Shift>true</correctT0Shift> </driver> <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug>
- <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
+ <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
<stripMaxSeparation>20.0</stripMaxSeparation> <stripTolerance>1.0</stripTolerance> </driver>
@@ -73,6 +70,5 @@
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> <collectionNames>TrackerHits</collectionNames> </driver>
- <driver name="LoadCalibrationsDriver" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver"/>
</drivers> </lcsim>
\ No newline at end of file
diff -u -r1.7 -r1.8 --- HPSTrackingDefaults.lcsim 7 Aug 2012 20:18:17 -0000 1.7 +++ HPSTrackingDefaults.lcsim 27 Aug 2012 22:42:19 -0000 1.8 @@ -1,51 +1,48 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
- - <inputFiles> - <file>${inputFile}.slcio</file> - </inputFiles>
<control>
- <numberOfEvents>-1</numberOfEvents>
<printInputFiles>true</printInputFiles> <printDriversDetailed>true</printDriversDetailed> </control> <execute> <driver name="EventMarkerDriver"/>
- <driver name="SVTSetupDriver"/>
+ <driver name="HPSCalibrationDriver"/>
+ <driver name="SVTBadChannelFilterDriver"/>
<driver name="TrackerDigiDriver"/> <driver name="TrackerReconDriver"/> <driver name="LCIOWriter"/> </execute> <drivers>
+ <driver name="SVTBadChannelFilterDriver" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver"/>
- <driver name="SVTSetupDriver" - type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">
+ <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"> +<!-- <runNumber>1351</runNumber> -->
</driver> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
+ <eventInterval>1000</eventInterval>
</driver> <driver name="TrackerDigiDriver" type="org.lcsim.hps.recon.tracking.TrackerDigiDriver">
- <debug>true</debug>
+ <debug>false</debug>
</driver> <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
- <debug>true</debug> - <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt0.xml</strategyResource>
+ <debug>false</debug> + <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
<stripMaxSeparation>20.0</stripMaxSeparation> <stripTolerance>1.0</stripTolerance> </driver> <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${inputFile}_trackRecon</outputFilePath>
+ <outputFilePath>${outputFile}</outputFilePath>
</driver> </drivers>
diff -u -r1.14 -r1.15 --- HPSTestRunReconToEvio.lcsim 21 Aug 2012 01:06:51 -0000 1.14 +++ HPSTestRunReconToEvio.lcsim 27 Aug 2012 22:42:19 -0000 1.15 @@ -4,7 +4,6 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <execute>
- <driver name="LoadCalibrations"/>
<driver name="HPSCalibrationDriver"/> <!-- <driver name="Timer1"/>--> <driver name="EcalReadout"/>
@@ -22,7 +21,6 @@
</execute> <drivers>
- <driver name="LoadCalibrations" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver" />
<driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> <driver name="Timer1" type="org.lcsim.hps.util.TimerDriver"> <name>1</name>
@@ -50,7 +48,6 @@
<driver name="EcalConverter" type="org.lcsim.hps.recon.ecal.HPSEcalConverterDriver">
- <ecalName>Ecal</ecalName>
<rawCollectionName>EcalRawHits</rawCollectionName> <ecalCollectionName>EcalCorrectedHits</ecalCollectionName> <scale>1</scale>
@@ -65,7 +62,6 @@
<driver name="EcalTrigger" type="org.lcsim.hps.recon.ecal.TestRunTriggerDriver"> <clusterCollectionName>EcalClusters</clusterCollectionName>
- <ecalName>Ecal</ecalName>
<deadTime>10</deadTime> </driver>
diff -N HPSTestRunFastSimToEvio.lcsim --- HPSTestRunFastSimToEvio.lcsim 21 Aug 2012 01:06:51 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,94 +0,0 @@
- -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> - <inputFiles> - <file>${inputFile}</file> - </inputFiles> - <control> - <printInputFiles>true</printInputFiles> - <printDriversDetailed>true</printDriversDetailed> - </control> - <execute> - <driver name="EventMarkerDriver"/> -<!-- <driver name="Timer1"/>--> - <driver name="HPSCalibrationDriver"/> - <driver name="EcalRawConverter"/> - <driver name="EcalClusterer"/> - <driver name="EcalTriggerFilter"/> - <driver name="EcalTriggerClusterer"/> - <driver name="TrackerDigiDriver"/> -<!-- <driver name="Timer2"/>--> - <driver name="TrackerReconDriver"/> -<!-- <driver name="Timer3"/>--> - - <driver name="TestRunReconToEvio"/> - -<!-- <driver name="CleanupDriver"/>--> -<!-- - <driver name="LCIOWriter"/> ---> - </execute> - <drivers> - <driver name="Timer1" type="org.lcsim.hps.util.TimerDriver"> - <name>1</name> - </driver> - <driver name="Timer2" type="org.lcsim.hps.util.TimerDriver"> - <name>2</name> - </driver> - <driver name="Timer3" type="org.lcsim.hps.util.TimerDriver"> - <name>3</name> - </driver> - <driver name="EcalGainDriver" - type="org.lcsim.hps.users.phansson.ECalGainDriver"> - <debug>false</debug> - <hideFrame>true</hideFrame> - <outputPlotFileName>gaindriver_sim.aida</outputPlotFileName> - <ecalGainFileName>clusterlist_sim.txt</ecalGainFileName> - <simTrigger>true</simTrigger> - </driver> - - <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> - <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalEdepToTriggerConverterDriver"> - </driver> - <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver"> - <inputCollection>EcalTriggerHits</inputCollection> - <outputCollection>EcalFilteredHits</outputCollection> - </driver> - <driver name="EcalTriggerClusterer" - type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer"> - <ecalName>Ecal</ecalName> - <ecalCollectionName>EcalFilteredHits</ecalCollectionName> - <clusterCollectionName>EcalTriggerClusters</clusterCollectionName> - </driver> - <driver name="EcalClusterer" - type="org.lcsim.hps.recon.ecal.HPSEcalClusterer"> - <ecalName>Ecal</ecalName> - <ecalCollectionName>EcalCalHits</ecalCollectionName> - </driver> - <driver name="CleanupDriver" - type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> - <collectionNames>TrackerHits</collectionNames> - </driver> - <driver name="SVTSetupDriver" - type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup"> - </driver> - <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> - <eventInterval>1000</eventInterval> - </driver> - <driver name="TrackerDigiDriver" - type="org.lcsim.hps.recon.tracking.TrackerDigiDriver"> - <debug>false</debug> - </driver> - <driver name="TrackerReconDriver" - type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> - <debug>false</debug> - <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource> - <stripMaxSeparation>20.0</stripMaxSeparation> - <stripTolerance>1.0</stripTolerance> - </driver> - <driver name="LCIOWriter" - type="org.lcsim.util.loop.LCIODriver"> - <outputFilePath>/Users/phansson/work/HPS/software/reco/run/hps_recon.slcio</outputFilePath> - </driver> - </drivers> -</lcsim>
diff -N LoadCalibrationsDriver.java --- LoadCalibrationsDriver.java 1 Jun 2012 22:00:26 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@
-package org.lcsim.hps.recon.tracking; - -//--- org.lcsim ---// -import org.lcsim.geometry.Detector; -import org.lcsim.hps.monitoring.HPSCalibrationListener; -import org.lcsim.util.Driver; - -/** - * - * @author Omar Moreno <[log in to unmask]> - * @version $Id: LoadCalibrationsDriver.java,v 1.1 2012/06/01 22:00:26 omoreno Exp $ - * - */ -public class LoadCalibrationsDriver extends Driver { - - @Override - protected void detectorChanged(Detector detector){ - HPSCalibrationListener calibListener = new HPSCalibrationListener(); - calibListener.begin(); - } -}
diff -u -r1.5 -r1.6 --- HPSCalibrationListener.java 27 Aug 2012 18:51:31 -0000 1.5 +++ HPSCalibrationListener.java 27 Aug 2012 22:42:20 -0000 1.6 @@ -12,17 +12,23 @@
/** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSCalibrationListener.java,v 1.5 2012/08/27 18:51:31 meeg Exp $
+ * @version $Id: HPSCalibrationListener.java,v 1.6 2012/08/27 22:42:20 meeg Exp $
*/ public class HPSCalibrationListener implements EtEventListener {
+ private static boolean beginDone = false; + private static boolean prestartDone = false; +
@Override public void begin() {
- // Load calibration constants and bad SVT channels found during QA
+ if (!beginDone) { + // Load calibration constants and bad SVT channels found during QA
// HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(System.currentTimeMillis()), -1);
- HPSSVTCalibrationConstants.loadBadChannels(-1); - HPSEcalConditions.loadPedestals(); - FieldMap.loadFieldMap();
+ HPSSVTCalibrationConstants.loadBadChannels(-1); + HPSEcalConditions.loadPedestals(); + FieldMap.loadFieldMap(); + beginDone = true; + }
} @Override
@@ -43,8 +49,16 @@
@Override public void prestart(int seconds, int runNumber) {
- // Load calibration constants and bad SVT channels found for the specified run - HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(((long) seconds) * 1000), runNumber);
+ // Load calibration constants and bad SVT channels found for the specified run + HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(((long) seconds) * 1000), runNumber); + prestartDone = true; + } + + // Won't overwrite calibrations specified by an actual prestart event. Used by HPSCalibrationDriver. + public void defaultPrestart(int seconds, int runNumber) { + if (!prestartDone) { + prestart(seconds, runNumber); + }
} @Override
@@ -62,13 +76,13 @@
Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT")); switch (timeTokens.length) { case 3:
- calendar.set(Integer.parseInt(timeTokens[0]), Integer.parseInt(timeTokens[1])-1, Integer.parseInt(timeTokens[2]));
+ calendar.set(Integer.parseInt(timeTokens[0]), Integer.parseInt(timeTokens[1]) - 1, Integer.parseInt(timeTokens[2]));
break; case 5:
- calendar.set(Integer.parseInt(timeTokens[0]), Integer.parseInt(timeTokens[1])-1, Integer.parseInt(timeTokens[2]), Integer.parseInt(timeTokens[3]), Integer.parseInt(timeTokens[4]));
+ calendar.set(Integer.parseInt(timeTokens[0]), Integer.parseInt(timeTokens[1]) - 1, Integer.parseInt(timeTokens[2]), Integer.parseInt(timeTokens[3]), Integer.parseInt(timeTokens[4]));
break; case 6:
- calendar.set(Integer.parseInt(timeTokens[0]), Integer.parseInt(timeTokens[1])-1, Integer.parseInt(timeTokens[2]), Integer.parseInt(timeTokens[3]), Integer.parseInt(timeTokens[4]), Integer.parseInt(timeTokens[5]));
+ calendar.set(Integer.parseInt(timeTokens[0]), Integer.parseInt(timeTokens[1]) - 1, Integer.parseInt(timeTokens[2]), Integer.parseInt(timeTokens[3]), Integer.parseInt(timeTokens[4]), Integer.parseInt(timeTokens[5]));
break; default: throw new RuntimeException("Invalid timestamp: " + time);
diff -u -r1.6 -r1.7 --- HPSCalibrationDriver.java 27 Aug 2012 18:51:31 -0000 1.6 +++ HPSCalibrationDriver.java 27 Aug 2012 22:42:20 -0000 1.7 @@ -1,39 +1,39 @@
package org.lcsim.hps.monitoring; import org.lcsim.geometry.Detector;
+import org.lcsim.hps.evio.EventConstants;
import org.lcsim.hps.recon.ecal.HPSEcalConditions;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
import org.lcsim.hps.recon.tracking.HPSSVTSensorSetup; import org.lcsim.util.Driver; /** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSCalibrationDriver.java,v 1.6 2012/08/27 18:51:31 meeg Exp $
+ * @version $Id: HPSCalibrationDriver.java,v 1.7 2012/08/27 22:42:20 meeg Exp $
*/ public class HPSCalibrationDriver extends Driver {
- - // The test run number of interest. If it equals to -1, the defaults calibrations
+ + // The test run number of interest. If it equals -1, the default calibrations
// are loaded
- int runNumber = -1; -
+ private int runNumber = -1; + + public HPSCalibrationDriver() { + add(new HPSEcalConditions()); + add(new HPSSVTSensorSetup()); + } +
/** * */
- public void setRunNumber(int runNumber){
+ public void setRunNumber(int runNumber) {
this.runNumber = runNumber; }
-
+
@Override
- public void detectorChanged(Detector detector){ - super.detectorChanged(detector); -// HPSSVTCalibrationConstants.loadCalibrationConstants(new Date(System.currentTimeMillis()), runNumber); - HPSSVTCalibrationConstants.loadBadChannels(runNumber); - } - - public HPSCalibrationDriver() { - add(new HPSEcalConditions()); - add(new HPSSVTSensorSetup()); -
+ protected void detectorChanged(Detector detector) { + super.detectorChanged(detector); + HPSCalibrationListener calibListener = new HPSCalibrationListener(); + calibListener.begin(); + calibListener.defaultPrestart(EventConstants.MC_TIME, runNumber);
} }
diff -u -r1.2 -r1.3 --- HPSEcalReadoutToTriggerConverterDriver.java 1 Aug 2012 23:32:46 -0000 1.2 +++ HPSEcalReadoutToTriggerConverterDriver.java 27 Aug 2012 22:42:20 -0000 1.3 @@ -166,7 +166,7 @@
if (truncatedIntegral <= 0) { truncatedIntegral = 0; }
- CalorimeterHit h = new HPSRawCalorimeterHit(truncatedIntegral, hit.getPosition(), hitTime, id, 0);
+ CalorimeterHit h = new HPSRawCalorimeterHit(truncatedIntegral, hitTime, id, 0);
// CalorimeterHit h = new HPSRawCalorimeterHit(triggerIntegral + 0.0000001, hit.getPosition(), hitTime, id, 0); //+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY return h;
diff -u -r1.19 -r1.20 --- TestRunTriggeredReconToEvio.java 21 Aug 2012 01:06:51 -0000 1.19 +++ TestRunTriggeredReconToEvio.java 27 Aug 2012 22:42:20 -0000 1.20 @@ -162,7 +162,7 @@
// Make a new EVIO event. EventBuilder builder = new EventBuilder(EventConstants.PRESTART_EVENT_TAG, DataType.UINT32, EventConstants.EVENT_BANK_NUM); int[] prestartData = new int[3];
- prestartData[0] = 2019686400; //Unix time in seconds - this value for MC data
+ prestartData[0] = EventConstants.MC_TIME; //Unix time in seconds - this value for MC data
prestartData[1] = 0; //run number prestartData[2] = 0; //run type
diff -u -r1.14 -r1.15 --- EventConstants.java 3 Aug 2012 23:14:39 -0000 1.14 +++ EventConstants.java 27 Aug 2012 22:42:20 -0000 1.15 @@ -41,6 +41,7 @@
// The tag for trigger data. public static final int TRIGGER_BANK_TAG = 0xe106; public static final int SVT_TOTAL_NUMBER_FPGAS = 8;
+ public static final int MC_TIME = 2019686400; //Unix time (in seconds) used for Monte Carlo data - 1/1/2034
/** * Check if this event is a Pre Start Event.
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1