Author: [log in to unmask]
Date: Tue Nov 10 15:19:41 2015
New Revision: 3946
Log:
Merge changes from trunk.
Added:
java/branches/jeremy-dev/users/src/main/java/org/hps/users/kmccarty/CountTriggersDriver.java
- copied, changed from r3944, java/trunk/users/src/main/java/org/hps/users/kmccarty/CountTriggersDriver.java
java/branches/jeremy-dev/users/src/main/java/org/hps/users/kmccarty/EvioAnalysis.java
- copied unchanged from r3944, java/trunk/users/src/main/java/org/hps/users/kmccarty/EvioAnalysis.java
Modified:
java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/analysis/TriggerDiagnosticsAnalysis.lcsim
Modified: java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/analysis/TriggerDiagnosticsAnalysis.lcsim
=============================================================================
--- java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/analysis/TriggerDiagnosticsAnalysis.lcsim (original)
+++ java/branches/jeremy-dev/steering-files/src/main/resources/org/hps/steering/analysis/TriggerDiagnosticsAnalysis.lcsim Tue Nov 10 15:19:41 2015
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<control>
<printInputFiles>false</printInputFiles>
@@ -6,7 +7,6 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="ConditionsDriver"/>
<driver name="DAQConfig"/>
<driver name="EcalRawConverter"/>
<driver name="GTPTestDriver"/>
@@ -21,10 +21,6 @@
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
-
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <tag>pass0</tag>
</driver>
<driver name="DAQConfig" type="org.hps.record.daqconfig.DAQConfigDriver"/>
Copied: java/branches/jeremy-dev/users/src/main/java/org/hps/users/kmccarty/CountTriggersDriver.java (from r3944, java/trunk/users/src/main/java/org/hps/users/kmccarty/CountTriggersDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/kmccarty/CountTriggersDriver.java (original)
+++ java/branches/jeremy-dev/users/src/main/java/org/hps/users/kmccarty/CountTriggersDriver.java Tue Nov 10 15:19:41 2015
@@ -70,10 +70,10 @@
// Otherwise, increment the relevant trigger counts.
if(tiBank.isPulserTrigger()) { triggers[PULSER]++; }
- else if(tiBank.isSingle0Trigger()) { triggers[SINGLES0]++; }
- else if(tiBank.isSingle1Trigger()) { triggers[SINGLES1]++; }
- else if(tiBank.isPair0Trigger()) { triggers[PAIR0]++; }
- else if(tiBank.isPair1Trigger()) { triggers[PAIR1]++; }
- else if(tiBank.isCalibTrigger()) { triggers[COSMIC]++; }
+ if(tiBank.isSingle0Trigger()) { triggers[SINGLES0]++; }
+ if(tiBank.isSingle1Trigger()) { triggers[SINGLES1]++; }
+ if(tiBank.isPair0Trigger()) { triggers[PAIR0]++; }
+ if(tiBank.isPair1Trigger()) { triggers[PAIR1]++; }
+ if(tiBank.isCalibTrigger()) { triggers[COSMIC]++; }
}
}
|