Author: [log in to unmask]
Date: Tue Feb 17 14:48:32 2015
New Revision: 2159

Log:
Minor fix to the trigger logic. Values should now pass cuts when less than or equal to or greater than or equal to as appropriate. Previously, some would fail when equal to the threshold value, which is inaccurate with respect to the hardware.

Modified:
    java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java

Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java
 =============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java	(original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java	Tue Feb 17 14:48:32 2015
@@ -709,7 +709,7 @@
      * and <code>false</code> if the cluster does not.
      */
     private boolean clusterSeedEnergyCutHigh(double seedEnergy) {
-        return (seedEnergy < cuts.get(CLUSTER_SEED_ENERGY_HIGH));
+        return (seedEnergy <= cuts.get(CLUSTER_SEED_ENERGY_HIGH));
     }
     
     /**
@@ -720,7 +720,7 @@
      * and <code>false</code> if the cluster does not.
      */
     private boolean clusterSeedEnergyCutLow(double seedEnergy) {
-        return (seedEnergy > cuts.get(CLUSTER_SEED_ENERGY_LOW));
+        return (seedEnergy >= cuts.get(CLUSTER_SEED_ENERGY_LOW));
     }
     
     /**
@@ -742,7 +742,7 @@
      * and <code>false</code> if the cluster does not.
      */
     private boolean clusterTotalEnergyCutHigh(double clusterEnergy) {
-        return (clusterEnergy < cuts.get(CLUSTER_TOTAL_ENERGY_HIGH));
+        return (clusterEnergy <= cuts.get(CLUSTER_TOTAL_ENERGY_HIGH));
     }
     
     /**
@@ -753,7 +753,7 @@
      * and <code>false</code> if the cluster does not.
      */
     private boolean clusterTotalEnergyCutLow(double clusterEnergy) {
-        return (clusterEnergy > cuts.get(CLUSTER_TOTAL_ENERGY_LOW));
+        return (clusterEnergy >= cuts.get(CLUSTER_TOTAL_ENERGY_LOW));
     }
     
     /**
@@ -884,7 +884,7 @@
      * the cut and <code>false</code> if it does not.
      */
     private boolean pairCoplanarityCut(double coplanarityAngle) {
-        return (coplanarityAngle < cuts.get(PAIR_COPLANARITY_HIGH));
+        return (coplanarityAngle <= cuts.get(PAIR_COPLANARITY_HIGH));
     }
     
     /**
@@ -896,7 +896,7 @@
      * the cut and <code>false</code> if it does not.
      */
     private boolean pairEnergyDifferenceCut(double energyDifference) {
-        return (energyDifference < cuts.get(PAIR_ENERGY_DIFFERENCE_HIGH));
+        return (energyDifference <= cuts.get(PAIR_ENERGY_DIFFERENCE_HIGH));
     }
     
     /**
@@ -906,7 +906,7 @@
      * the cut and <code>false</code> if it does not.
      */
     private boolean pairEnergySlopeCut(double energySlope) {
-        return (energySlope > cuts.get(PAIR_ENERGY_SLOPE_LOW));
+        return (energySlope >= cuts.get(PAIR_ENERGY_SLOPE_LOW));
     }
     
     /**
@@ -928,7 +928,7 @@
      * the cut and <code>false</code> if it does not.
      */
     private boolean pairEnergySumCutHigh(double energySum) {
-        return (energySum < cuts.get(PAIR_ENERGY_SUM_HIGH));
+        return (energySum <= cuts.get(PAIR_ENERGY_SUM_HIGH));
     }
     
     /**
@@ -939,7 +939,7 @@
      * the cut and <code>false</code> if it does not.
      */
     private boolean pairEnergySumCutLow(double energySum) {
-        return (energySum > cuts.get(PAIR_ENERGY_SUM_LOW));
+        return (energySum >= cuts.get(PAIR_ENERGY_SUM_LOW));
     }
     
     /**