Author: [log in to unmask]
Date: Mon Nov 10 03:08:35 2014
New Revision: 1468
Log:
Commit local changes
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/DummyRecon.lcsim
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim Mon Nov 10 03:08:35 2014
@@ -5,26 +5,36 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="ConditionsDriver"/>
- <driver name="EcalRawConverter"/>
- <driver name="EcalLedCommissioning"/>
+ <driver name="ConditionsDriver"/>
+ <driver name="EcalRawConverter"/>
+ <driver name="EcalEventDisplay"/> <!-- Ecal event display -->
+
+
+<!-- <driver name="RunControlDriver" />-->
+ <!--<driver name="AidaSaveDriver"/>-->
</execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <loadSvtConditions>false</loadSvtConditions>
- </driver>
+
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+
+
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<applyBadCrystalMap>false</applyBadCrystalMap>
</driver>
- <driver name="EcalLedCommissioning" type="org.hps.monitoring.ecal.plots.EcalLedCommissioning">
+
+ <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
<inputCollection>EcalCalHits</inputCollection>
<inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
<inputClusterCollection>EcalClusters</inputClusterCollection>
- <maxEch>2.0</maxEch>
+ <enableAllFadc>true</enableAllFadc>
+ <pedSamples>20</pedSamples>
+ <maxEch>10.0</maxEch>
+ <minEch>-0.01</minEch>
<eventRefreshRate>100</eventRefreshRate>
</driver>
+
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim Mon Nov 10 03:08:35 2014
@@ -9,7 +9,6 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="ConditionsDriver"/>
- <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalMonitoringPlots"/> <!-- General plots -->
@@ -37,12 +36,8 @@
<eventInterval>1</eventInterval>
</driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <conditionsReaderClass>org.hps.conditions.deprecated.TestRunConditionsReader</conditionsReaderClass>
- </driver>
-
- <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"/>
-
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<!-- <threshold>150</threshold>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
@@ -75,11 +70,14 @@
<inputCollection>EcalCalHits</inputCollection>
</driver>
- <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
+ <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
<inputCollection>EcalCalHits</inputCollection>
<inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
<inputClusterCollection>EcalClusters</inputClusterCollection>
- <maxEch>2.0</maxEch>
+ <enableAllFadc>true</enableAllFadc>
+ <pedSamples>20</pedSamples>
+ <maxEch>10.0</maxEch>
+ <minEch>-0.01</minEch>
<eventRefreshRate>100</eventRefreshRate>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/DummyRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/DummyRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/DummyRecon.lcsim Mon Nov 10 03:08:35 2014
@@ -16,6 +16,7 @@
<!-- <driver name="RunControlDriver" />-->
<driver name="AidaSaveDriver"/>
+ <driver name="LCIOWriter"/>
<driver name="CleanupDriver"/>
</execute>
@@ -38,17 +39,15 @@
<inputCollection>EcalCalHits</inputCollection>
<inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
<inputClusterCollection>EcalClusters</inputClusterCollection>
- <enableAllFadc>true</enableAllFadc>
- <pedSamples>20</pedSamples>
- <maxEch>10.0</maxEch>
- <minEch>-0.01</minEch>
- <eventRefreshRate>100</eventRefreshRate>
+ <pedSamples>20</pedSamples>
</driver>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}</outputFileName>
</driver>
-
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
+ <outputFilePath>${outputFile}</outputFilePath>
+ </driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers>
</lcsim>
|