Author: [log in to unmask]
Date: Wed Mar 25 18:53:14 2015
New Revision: 2571
Log:
reverting adding of trigger monitoring to the general ECal monitoring steering file. Trigger monitoring should have its own dedicated monitoring steering file. Some params in this steering file for EcalRawConDriver were changed/added, but I did not investigate that.
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.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 Wed Mar 25 18:53:14 2015
@@ -8,11 +8,17 @@
<execute>
<!-- <driver name="EventMarkerDriver"/> -->
<driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+
+
+<!-- Trigger Monitoring Does not Belong in tHis steering file.
+ It Should Have its Own Monitorong app and steering file
<driver name="DAQConfig"/>
<driver name="DAQConfigDriver" />
-<!-- <driver name="EcalClusterer" /> --><!-- This is done elsewhere! -->
<driver name="GTPTestDriver" />
- <driver name="TriggerDiagnostics" />
+ <driver name="TriggerDiagnostics" />
+-->
+
<driver name="EcalMonitoringPlots" /> <!-- General plots -->
<driver name="EcalHitPlots" /> <!-- Single hit distributions -->
<driver name="EcalClusterPlots" /> <!-- Clusters distributions -->
@@ -29,11 +35,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="DAQConfig" type="org.hps.recon.ecal.daqconfig.DAQConfigDriver"/>
-
- <driver name="DAQConfigDriver" type="org.hps.recon.ecal.daqconfig.DAQConfigDriver">
- </driver>
-
+
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>false</use2014Gain>
@@ -48,34 +50,7 @@
<nsb>20</nsb>
<nPeak>3</nPeak>
</driver>
- <driver name="GTPTestDriver" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
- <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
- <!-- <seedEnergyThreshold>0.500</seedEnergyThreshold>
- <windowBefore>3</windowBefore>
- <windowAfter>3</windowAfter> -->
- <seedEnergyThreshold>0.010</seedEnergyThreshold>
- <windowBefore>2</windowBefore>
- <windowAfter>2</windowAfter>
- <useDAQConfig>true</useDAQConfig>
- <verbose>false</verbose>
- </driver>
-
- <driver name="TriggerDiagnostics" type="org.hps.analysis.trigger.TriggerDiagnosticDriver">
- <printResultsEveryNEvents>10000</printResultsEveryNEvents>
- <hitAcceptanceWindow>0</hitAcceptanceWindow>
- <noiseThresholdCount>100</noiseThresholdCount>
- <energyAcceptanceWindow>0.009</energyAcceptanceWindow>
- <printOnClusterFailure>false</printOnClusterFailure>
- <printOnSinglesSSPFailure>false</printOnSinglesSSPFailure>
- <printOnSinglesEfficiencyFailure>false</printOnSinglesEfficiencyFailure>
- <printOnPairSSPFailure>false</printOnPairSSPFailure>
- <printOnPairEfficiencyFailure>false</printOnPairEfficiencyFailure>
- <enforceStrictTimeCompliance>true</enforceStrictTimeCompliance> <!-- Set to false for mode-7 -->
- <readDAQConfig>true</readDAQConfig>
- <verbose>false</verbose>
- </driver>
-
- <driver name="GUIDiagnostics" type="org.hps.monitoring.trigger.TriggerDiagnosticGUIDriver"/>
+
<driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
<logLevel>WARNING</logLevel>
@@ -115,5 +90,39 @@
<eventRefreshRate>1</eventRefreshRate>
</driver>
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver" />
+
+
+<!--
+ Trigger diagnostics should be in its own steering file, leaving these here for now:
+ <driver name="DAQConfig" type="org.hps.recon.ecal.daqconfig.DAQConfigDriver"/>
+ <driver name="DAQConfigDriver" type="org.hps.recon.ecal.daqconfig.DAQConfigDriver"/>
+ <driver name="GTPTestDriver" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+ <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+ <!-- <seedEnergyThreshold>0.500</seedEnergyThreshold>
+ <windowBefore>3</windowBefore>
+ <windowAfter>3</windowAfter> -->
+ <seedEnergyThreshold>0.010</seedEnergyThreshold>
+ <windowBefore>2</windowBefore>
+ <windowAfter>2</windowAfter>
+ <useDAQConfig>true</useDAQConfig>
+ <verbose>false</verbose>
+ </driver>
+ <driver name="TriggerDiagnostics" type="org.hps.analysis.trigger.TriggerDiagnosticDriver">
+ <printResultsEveryNEvents>10000</printResultsEveryNEvents>
+ <hitAcceptanceWindow>0</hitAcceptanceWindow>
+ <noiseThresholdCount>100</noiseThresholdCount>
+ <energyAcceptanceWindow>0.009</energyAcceptanceWindow>
+ <printOnClusterFailure>false</printOnClusterFailure>
+ <printOnSinglesSSPFailure>false</printOnSinglesSSPFailure>
+ <printOnSinglesEfficiencyFailure>false</printOnSinglesEfficiencyFailure>
+ <printOnPairSSPFailure>false</printOnPairSSPFailure>
+ <printOnPairEfficiencyFailure>false</printOnPairEfficiencyFailure>
+ <enforceStrictTimeCompliance>true</enforceStrictTimeCompliance> <!-- Set to false for mode-7 -->
+ <readDAQConfig>true</readDAQConfig>
+ <verbose>false</verbose>
+ </driver>
+ <driver name="GUIDiagnostics" type="org.hps.monitoring.trigger.TriggerDiagnosticGUIDriver"/>
+-->
+
</drivers>
</lcsim>
