Print

---

Author: [log in to unmask]
Date: Fri Mar  6 12:38:44 2015
New Revision: 2302

Log:
Fixed a minor bug in the trigger diagnostics.

Modified:
    java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java
    java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java

Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java
 =============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java	(original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java	Fri Mar  6 12:38:44 2015
@@ -72,7 +72,7 @@
 	private long localWindowStart = 0;
 	private boolean readDAQConfig = false;
 	private double energyAcceptance = 0.03;
-	private int localWindowThreshold = 30000;
+	private int localWindowThreshold = 10 * 1000;
 	private boolean performClusterVerification = true;
 	private boolean performSinglesTriggerVerification = true;
 	private boolean performPairTriggerVerification = true;
@@ -1049,7 +1049,7 @@
 		if(sspReportedExtras > 0) {
 			if(isSingles) { singlesInternalFail = true; }
 			else { pairInternalFail = true; }
-		}
+		} else { sspReportedExtras = 0; }
 		
 		// Iterate over the triggers.
 		OutputLogger.println();

Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java
 =============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java	(original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java	Fri Mar  6 12:38:44 2015
@@ -126,7 +126,7 @@
 		// treated as a failure due to time, which is not tracked.
 		if(sspTrigger != null) {
 			sspInternalMatched[sspTrigger.isFirstTrigger() ? 0 : 1]++;
-			sspPairList.add(new TriggerMatchedPair(simTrigger, sspTrigger, new boolean[] { true, true, true, true, true }));
+			sspPairList.add(new TriggerMatchedPair(simTrigger, sspTrigger, new boolean[] { true, true, true, true }));
 		}
 	}