5 modified files
hps-java/src/main/resources/org/lcsim/hps/steering
diff -u -r1.1 -r1.2
--- HPSTestRunLcioToEvio.lcsim 31 Jul 2012 00:08:40 -0000 1.1
+++ HPSTestRunLcioToEvio.lcsim 31 Aug 2012 01:30:47 -0000 1.2
@@ -3,15 +3,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>
- <numberOfEvents>-1</numberOfEvents>
- </control>
-
<execute>
<driver name="DummyTrigger"/>
<driver name="TestRunReconToEvio"/>
@@ -26,8 +17,7 @@
<driver name="TestRunReconToEvio" type="org.lcsim.hps.evio.TestRunTriggeredReconToEvio">
<evioOutputFile>${evioFile}</evioOutputFile>
</driver>
- <driver name="ClockDriver"
- type="org.lcsim.hps.util.ClockDriver">
+ <driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver">
</driver>
</drivers>
</lcsim>
hps-java/src/main/resources/org/lcsim/hps/steering
diff -u -r1.4 -r1.5
--- EcalGainDriverSim.lcsim 27 Aug 2012 22:42:19 -0000 1.4
+++ EcalGainDriverSim.lcsim 31 Aug 2012 01:30:47 -0000 1.5
@@ -7,38 +7,19 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
-<!-- <driver name="Timer1"/>-->
<driver name="HPSCalibrationDriver"/>
-<!-- <driver name="SVTBadChannelFilterDriver"/>-->
<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="EcalGainDriver"/>
-
-<!-- <driver name="CleanupDriver"/>-->
<!--
<driver name="LCIOWriter"/>
-->
</execute>
<drivers>
- <driver name="SVTBadChannelFilterDriver" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver"/>
-
-
- <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>
@@ -49,7 +30,6 @@
</driver>
<driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
- <runNumber>1351</runNumber>
</driver>
<driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalEdepToTriggerConverterDriver">
</driver>
@@ -68,13 +48,6 @@
<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>
hps-java/src/main/resources/org/lcsim/hps/steering
diff -u -r1.4 -r1.5
--- SVTMonitoring.lcsim 27 Aug 2012 22:42:19 -0000 1.4
+++ SVTMonitoring.lcsim 31 Aug 2012 01:30:47 -0000 1.5
@@ -2,7 +2,8 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver" />
- <driver name="SVTSetupDriver" />
+ <driver name="HPSCalibrationDriver"/>
+ <driver name="RawTrackerHitSensorSetup"/>
<driver name="SVTPulsePlots"/>
<driver name="RawTrackerHitFitterDriver" />
@@ -12,21 +13,20 @@
<driver name="TrackerHitDriver" />
<driver name="SVTHitRecoPlots"/>
-<!-- <driver name="TrackerReconDriver" />
- <driver name="SVTSimpleEventDisplay"/>
- <driver name="TrackTimePlots"/>
+ <driver name="TrackerReconDriver" />
+<!-- <driver name="SVTSimpleEventDisplay"/>-->
+<!-- <driver name="TrackTimePlots"/>-->
<driver name="EcalRawConverter" />
<driver name="EcalClusterer" />
- <driver name="TrackingReconstructionPlots" />-->
-
- <driver name="CleanupDriver" />
+ <driver name="TrackingReconstructionPlots" />
</execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup" />
+ <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
<driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
@@ -67,8 +67,5 @@
<fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
</driver>
<driver name="TrackTimePlots" type="org.lcsim.hps.monitoring.svt.TrackTimePlots"/>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
- <collectionNames>TrackerHits</collectionNames>
- </driver>
</drivers>
</lcsim>
\ No newline at end of file
hps-java/src/main/resources/org/lcsim/hps/steering
diff -u -r1.13 -r1.14
--- ECalMonitoring.lcsim 27 Aug 2012 22:42:19 -0000 1.13
+++ ECalMonitoring.lcsim 31 Aug 2012 01:30:47 -0000 1.14
@@ -7,7 +7,7 @@
<printDriversDetailed>true</printDriversDetailed>
</control>
<execute>
-<!-- <driver name="EventMarkerDriver"/>-->
+ <driver name="EventMarkerDriver"/>
<driver name="HPSCalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -15,7 +15,7 @@
<driver name="EcalMonitoringPlots"/>
<driver name="EcalHitPlots"/>
<driver name="EcalClusterPlots"/>
-<!-- <driver name="EcalEvsX"/>-->
+ <driver name="EcalEvsX"/>
<!-- <driver name="TriggerPlots"/>-->
<!--
<driver name="EcalEventMonitor"/>
@@ -37,7 +37,7 @@
<eventRefreshRate>100</eventRefreshRate>
</driver>
<driver name="EcalEventMonitor" type="org.lcsim.hps.monitoring.ecal.EcalEventMonitor">
- <eventRefreshRate>1</eventRefreshRate>
+ <eventRefreshRate>1000</eventRefreshRate>
</driver>
<driver name="EcalWindowPlots" type="org.lcsim.hps.monitoring.ecal.EcalWindowPlotsXY">
<inputCollection>EcalReadoutHits</inputCollection>
hps-java/src/main/resources/org/lcsim/hps/steering
diff -u -r1.8 -r1.9
--- HPSTrackingDefaults.lcsim 27 Aug 2012 22:42:19 -0000 1.8
+++ HPSTrackingDefaults.lcsim 31 Aug 2012 01:30:47 -0000 1.9
@@ -1,3 +1,4 @@
+
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -9,15 +10,12 @@
<execute>
<driver name="EventMarkerDriver"/>
<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="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
@@ -27,8 +25,8 @@
<eventInterval>1000</eventInterval>
</driver>
- <driver name="TrackerDigiDriver"
- type="org.lcsim.hps.recon.tracking.TrackerDigiDriver">
+ <driver name="TrackerDigiDriver" type="org.lcsim.hps.users.meeg.SimpleTrackerDigiDriver">
+<!-- <dropBadChannels>true</dropBadChannels>-->
<debug>false</debug>
</driver>
CVSspam 0.2.12