Print

---

Author: [log in to unmask]
Date: Fri May  1 20:58:29 2015
New Revision: 2882

Log:
Fixed calculation errors in the trigger monitoring for the monitoring aplication.

Modified:
    java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTablePanel.java
    java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTriggerTablePanel.java
    java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/EfficiencyTablePanel.java

Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTablePanel.java
 =============================================================================
--- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTablePanel.java	(original)
+++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTablePanel.java	Fri May  1 20:58:29 2015
@@ -61,7 +61,7 @@
 		setLayout(null);
 		
 		// Create header labels for the tables.
-		localHeader = new JLabel("Local Statistics");
+		localHeader = new JLabel("Instantaneous Statistics");
 		localHeader.setHorizontalAlignment(JLabel.CENTER);
 		add(localHeader);
 		

Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTriggerTablePanel.java
 =============================================================================
--- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTriggerTablePanel.java	(original)
+++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/AbstractTriggerTablePanel.java	Fri May  1 20:58:29 2015
@@ -109,7 +109,7 @@
 			for(int i = 0; i < 2; i++) {
 				sspSimTriggers[i] = triggerStats[i][0].getSSPSimulatedTriggers() + triggerStats[i][1].getSSPSimulatedTriggers();
 				sspBankTriggers[i] = triggerStats[i][0].getReportedTriggers() + triggerStats[i][1].getReportedTriggers();
-				sspBankTriggers[i] = triggerStats[i][0].getReconSimulatedTriggers() + triggerStats[i][1].getReconSimulatedTriggers();
+				reconSimTriggers[i] = triggerStats[i][0].getReconSimulatedTriggers() + triggerStats[i][1].getReconSimulatedTriggers();
 				sspMatchedTriggers[i] = triggerStats[i][0].getMatchedSSPSimulatedTriggers() + triggerStats[i][1].getMatchedSSPSimulatedTriggers();
 				reconMatchedTriggers[i] = triggerStats[i][0].getMatchedReconSimulatedTriggers() + triggerStats[i][1].getMatchedReconSimulatedTriggers();
 			}

Modified: java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/EfficiencyTablePanel.java
 =============================================================================
--- java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/EfficiencyTablePanel.java	(original)
+++ java/trunk/monitoring-util/src/main/java/org/hps/monitoring/trigger/EfficiencyTablePanel.java	Fri May  1 20:58:29 2015
@@ -50,7 +50,8 @@
 		"", "Singles 0", "Singles 1", "Pair 0", "Pair 1", "Count"
 	};
 	private static final String[] ROW_NAMES = {
-		"", "Random", "Cosmic", "Singles 0", "Singles 1", "Pair 0", "Pair 1"
+		"", "Singles 0", "Singles 1", "Pair 0", "Pair 1", "Pulser", "Cosmic"
+		//"", "Random", "Cosmic", "Singles 0", "Singles 1", "Pair 0", "Pair 1"
 	};
 	
 	/**
@@ -141,7 +142,7 @@
 						globalText = globalText + " (  N/A  %)";
 					} else {
 						globalText = String.format("%s (%7.3f%%)", globalText,
-								(100.0 * matched[LOCAL][seenTriggerType][tiTriggerType] / triggers[GLOBAL][seenTriggerType][tiTriggerType]));
+								(100.0 * matched[GLOBAL][seenTriggerType][tiTriggerType] / triggers[GLOBAL][seenTriggerType][tiTriggerType]));
 					}
 					globalModel.setValueAt(globalText, tiTriggerType + 1, seenTriggerType + 1);
 				}
@@ -206,4 +207,4 @@
 		return new JTable[] { localTable, globalTable };
 	}
 	
-}
+}