java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -2,11 +2,9 @@

 
 import java.util.ArrayList;
 import java.util.List;

-

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawCalorimeterHit;

-import org.lcsim.geometry.Detector;

 import org.lcsim.util.Driver;
 import org.lcsim.lcio.LCIOConstants;
 

@@ -16,8 +14,6 @@

  * @version $Id: EcalConverterDriver.java,v 1.1 2013/02/25 22:39:24 meeg Exp $
  */
 public class EcalConverterDriver extends Driver {

-	
-	Detector detector = null;

 
     String rawCollectionName;
     String ecalReadoutName = "EcalHits";

@@ -55,11 +51,6 @@

             throw new RuntimeException("The parameter ecalCollectionName was not set!");
         }
     }

-    
-    @Override
-    public void detectorChanged(Detector detector) {
-    	this.detector = detector;
-    }

 
     @Override
     public void process(EventHeader event) {

@@ -86,9 +77,7 @@

     }
 
     private CalorimeterHit HitDtoA(RawCalorimeterHit hit) {

-    	HPSCalorimeterHit h = new HPSCalorimeterHit(DtoA(hit.getAmplitude(), hit.getCellID()), period * hit.getTimeStamp() + dt, hit.getCellID(), 0);
-        h.setDetector(detector);
-    	return h;

+        return new HPSCalorimeterHit(DtoA(hit.getAmplitude(), hit.getCellID()), period * hit.getTimeStamp() + dt, hit.getCellID(), 0);

     }
 
 //    private RawCalorimeterHit HitAtoD(CalorimeterHit hit) {

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -3,40 +3,20 @@

 import java.util.ArrayList;
 import java.util.List;
 

-
-//import org.hps.conditions.deprecated.EcalConditions;
-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.hps.util.RandomGaussian;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;
 import org.lcsim.util.Driver;
 

-

 /**
  *
  * @version $Id: HPSEcalRawConverterDriver.java,v 1.2 2012/05/03 00:17:54
  * phansson Exp $
  */
 public class EcalEdepToTriggerConverterDriver extends Driver {

-	
-	Detector detector = null;
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null; 
-    
-    private static boolean isBadChannelLoaded = true;
-	

+

     private String ecalReadoutName = "EcalHits";
     private String inputCollection = "EcalHits";
     private String readoutCollection = "EcalCalHits";

@@ -95,31 +75,12 @@

         }
     }
 

-

     @Override
     public void detectorChanged(Detector detector) {

-    	
-    	//Must be set to use the database conditions
-        this.detector = detector;
-    	
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for EcalEdepToTriggerConverterDriver.");

     }
 
     public boolean isBadCrystal(CalorimeterHit hit) {

-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-    	
-        return isBadChannelLoaded ? channelData.isBadChannel() : false;

+        return EcalConditions.badChannelsLoaded() ? EcalConditions.isBadChannel(hit.getCellID()) : false;

     }
 
     @Override

@@ -180,9 +141,7 @@

 
         int truncatedIntegral = (int) Math.floor(triggerIntegral / truncateScale);
         if (truncatedIntegral > 0) {

-        	HPSCalorimeterHit h = new HPSCalorimeterHit(truncatedIntegral, hit.getTime(), hit.getCellID(), 0);
-        	h.setDetector(detector);
-            return h ;

+            return new HPSCalorimeterHit(truncatedIntegral, hit.getTime(), hit.getCellID(), 0);

         }
         return null;
     }

@@ -192,12 +151,8 @@

             return null;
         }
 

-        
-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-        

 //        double integral = hit.getRawEnergy()/ECalUtils.GeV * gainScale;

-        double gain = _gain > 0 ? _gain : channelData.getGain().getGain();

+        double gain = _gain > 0 ? _gain : EcalConditions.physicalToGain(hit.getCellID());

         double integral = amplitude * gain * pulseIntegral * gainScale * ECalUtils.MeV / ECalUtils.GeV;
 
 //        double thresholdCrossingTime = 0 - hit.getTime();

@@ -221,24 +176,19 @@

 //        System.out.format("dumb: %f, full: %f\n",hit.getRawEnergy() * 1000.0,readoutIntegral * HPSEcalConditions.physicalToGain(id));
 
 //        System.out.format("readout: %f %f\n", amplitude, integral);

-        HPSCalorimeterHit h = new HPSCalorimeterHit(integral, hit.getTime(), hit.getCellID(), 0);
-        h.setDetector(detector);

+        CalorimeterHit h = new HPSCalorimeterHit(integral, hit.getTime(), hit.getCellID(), 0);

         return h;
     }
 
     private double hitAmplitude(CalorimeterHit hit) {
         double energyAmplitude = hit.getRawEnergy();

-        
-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-        

         if (addNoise) {
             //add preamp noise and photoelectron Poisson noise in quadrature

-            double noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * ECalUtils.MeV, 2) + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);

+            double noise = Math.sqrt(Math.pow(EcalConditions.physicalToNoise(hit.getCellID()) * EcalConditions.physicalToGain(hit.getCellID()) * ECalUtils.MeV, 2) + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);

             energyAmplitude += RandomGaussian.getGaussian(0, noise);
         }
 

-        double gain = _gain > 0 ? _gain : channelData.getGain().getGain();

+        double gain = _gain > 0 ? _gain : EcalConditions.physicalToGain(hit.getCellID());

 //        System.out.format("amplitude: %f %f %f %f\n", hit.getRawEnergy(), energyAmplitude, gain, (energyAmplitude / ECalUtils.MeV) / (gain * pulseIntegral));
         return (energyAmplitude / ECalUtils.MeV) / (gain * pulseIntegral);
     }

@@ -257,25 +207,4 @@

             }
         }
     }

-    
-    /** 
-     * Convert physical ID to gain value.
-     * @param cellID (long)
-     * @return channel constants (EcalChannelConstants)
-     */
-    private static EcalChannelConstants findChannel(long cellID) {
-        // Make an ID object from raw hit ID.
-        IIdentifier id = new Identifier(cellID);
-        
-        // Get physical field values.
-        int system = helper.getValue(id, "system");
-        int x = helper.getValue(id, "ix");
-        int y = helper.getValue(id, "iy");
-        
-        // Create an ID to search for in channel collection.
-        GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-                
-        // Get the channel data.
-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));    
-    }

 }

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -1,22 +1,10 @@

 package org.hps.recon.ecal;
 

-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.DatabaseConditionsManager;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.base.BaseRawCalorimeterHit;

-import org.lcsim.geometry.Detector;

 
 /**
  *

@@ -29,17 +17,8 @@

     private boolean constantGain = false;
     private double gain;
     private boolean use2014Gain = true;

-    
-    //get the database condition manager
-    
-//    Detector detector = DatabaseConditionsManager.getInstance().getDetectorObject();
-    Detector detector = null;
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null; 

-
-    public EcalRawConverter() {	

+    public EcalRawConverter() {

     }
 
     public void setGain(double gain) {

@@ -57,11 +36,7 @@

         if (debug) {
             System.out.println("Summing ADC for hit: " + hit.toString());
         }

-        
-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-        
-        double pedestal = channelData.getCalibration().getPedestal();

+        double pedestal = EcalConditions.physicalToPedestal(hit.getCellID());

         short sum = 0;
         short samples[] = hit.getADCValues();
         for (int isample = 0; isample < samples.length; ++isample) {

@@ -77,12 +52,10 @@

         double time = hit.getTime();
         long id = hit.getCellID();
         double rawEnergy = adcToEnergy(sumADC(hit), id);

-        HPSCalorimeterHit h1 = new HPSCalorimeterHit(rawEnergy + 0.0000001, time, id, 0);
-        h1.setDetector(detector);
-        

 //        double[] pos = hit.getDetectorElement().getGeometry().getPosition().v();

+        CalorimeterHit h = new HPSCalorimeterHit(rawEnergy + 0.0000001, time, id, 0);

         //+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY

-        return h1;

+        return h;

     }
 
     public CalorimeterHit HitDtoA(RawCalorimeterHit hit, int window, double timeOffset) {

@@ -91,26 +64,21 @@

         }
         double time = hit.getTimeStamp() / 16.0;
         long id = hit.getCellID();

-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(id);
-        double adcSum = hit.getAmplitude() - window * channelData.getCalibration().getPedestal();

+        double adcSum = hit.getAmplitude() - window * EcalConditions.physicalToPedestal(id);

         double rawEnergy = adcToEnergy(adcSum, id);

-        HPSCalorimeterHit h2 = new HPSCalorimeterHit(rawEnergy + 0.0000001, time + timeOffset, id, 0);
-        h2.setDetector(detector);

+        CalorimeterHit h = new HPSCalorimeterHit(rawEnergy + 0.0000001, time + timeOffset, id, 0);

         //+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY

-        return h2;

+        return h;

     }
 
     public RawCalorimeterHit HitAtoD(CalorimeterHit hit, int window) {
         int time = (int) (Math.round(hit.getTime() / 4.0) * 64.0);
         long id = hit.getCellID();

-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(id);

         int amplitude;
         if (constantGain) {

-            amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / gain + window * channelData.getCalibration().getPedestal());

+            amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / gain + window * EcalConditions.physicalToPedestal(id));

         } else {

-            amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / channelData.getGain().getGain() + window * channelData.getCalibration().getPedestal());

+            amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / EcalConditions.physicalToGain(id) + window * EcalConditions.physicalToPedestal(id));

         }
         RawCalorimeterHit h = new BaseRawCalorimeterHit(id, amplitude, time);
         return h;

@@ -120,21 +88,17 @@

      * return energy (units of GeV) corresponding to the ADC sum and crystal ID
      */
     private double adcToEnergy(double adcSum, long cellID) {

-    	
-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(cellID);
-    	

         if (use2014Gain) {
             if (constantGain) {
                 return adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod;
             } else {

-                return channelData.getGain().getGain() * adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod; // should not be used for the moment (2014/02)

+                return EcalConditions.physicalToGain(cellID) * adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod; // should not be used for the moment (2014/02)

             }
         } else {
             if (constantGain) {
                 return gain * adcSum * ECalUtils.MeV;
             } else {

-                return channelData.getGain().getGain() * adcSum * ECalUtils.MeV; //gain is defined as MeV/integrated ADC

+                return EcalConditions.physicalToGain(cellID) * adcSum * ECalUtils.MeV; //gain is defined as MeV/integrated ADC

             }
         }
     }

@@ -151,49 +115,4 @@

      return h;
      }
      */

-    /** 
-     * Must be set when an object EcalRawConverter is created.
-     * @param detector (long)
-     */   
-    void setDetector(Detector detector) {
-    	
-//    	h1.setDetector(detector);
-//    	h2.setDetector(detector);
-    	
-        this.detector = detector;
-        
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for EcalRawConverter.");
-    }
-    
-    /** 
-     * Convert physical ID to gain value.
-     * @param cellID (long)
-     * @return channel constants (EcalChannelConstants)
-     */
-    private static EcalChannelConstants findChannel(long cellID) {
-        // Make an ID object from raw hit ID.
-        IIdentifier id = new Identifier(cellID);
-        
-        // Get physical field values.
-        int system = helper.getValue(id, "system");
-        int x = helper.getValue(id, "ix");
-        int y = helper.getValue(id, "iy");
-        
-        // Create an ID to search for in channel collection.
-        GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-                
-        // Get the channel data.
-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));    
-    }   
-    

 }

\ No newline at end of file

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -3,19 +3,7 @@

 import java.util.ArrayList;
 import java.util.List;
 

-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.lcsim.detector.identifier.IIdentifierHelper;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.GenericObject;

@@ -32,13 +20,6 @@

  */
 public class EcalRawConverterDriver extends Driver {
 

-	// To import database conditions
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null; 
-    
-    Detector detector = null;
-    

     EcalRawConverter converter = null;
     String rawCollectionName = "EcalReadoutHits";
     String ecalReadoutName = "EcalHits";

@@ -51,10 +32,9 @@

     private boolean runBackwards = false;
     private boolean useTimestamps = false;
     private boolean useTruthTime = false;

-    private static boolean isBadChannelLoaded = true;

 
     public EcalRawConverterDriver() {

-    	converter = new EcalRawConverter();    	

+        converter = new EcalRawConverter();

     }
 
     public void setUse2014Gain(boolean use2014Gain) {

@@ -114,43 +94,17 @@

 
     @Override
     public void detectorChanged(Detector detector) {

-    	
-    	converter.setDetector(detector);
-    	
-    	// set the detector for the converter
-        this.detector = detector;
-    	
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for EcalRawConverterDriver.");

     }

-    /**
-     * @return false if the channel is a good one, true if it is a bad one
-     * @param CalorimeterHit
-     */
-    public static boolean isBadCrystal(CalorimeterHit hit) {   	
-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-    	
-        return isBadChannelLoaded ? channelData.isBadChannel() : false;

+
+    public static boolean isBadCrystal(CalorimeterHit hit) {
+        return EcalConditions.badChannelsLoaded() ? EcalConditions.isBadChannel(hit.getCellID()) : false;

     }

-    
-    /**
-     * @return false if the ADC is a good one, true if it is a bad one
-     * @param CalorimeterHit
-     */
-    public boolean isBadFADC(CalorimeterHit hit) {    	
-        return (getCrate(hit.getCellID()) == 1 && getSlot(hit.getCellID()) == 3);

+
+    public static boolean isBadFADC(CalorimeterHit hit) {
+        long daqID = EcalConditions.physicalToDaqID(hit.getCellID());
+        return (EcalConditions.getCrate(daqID) == 1 && EcalConditions.getSlot(daqID) == 3);

     }

-    

+

     private static double getTimestamp(int system, EventHeader event) { //FIXME: copied from org.hps.readout.ecal.ReadoutTimestamp
         if (event.hasCollection(GenericObject.class, "ReadoutTimestamps")) {
             List<GenericObject> timestamps = event.get(GenericObject.class, "ReadoutTimestamps");

@@ -181,8 +135,8 @@

             double t0ECal = getTimestamp(SYSTEM_ECAL, event);
             timeOffset += ((t0ECal + 250.0) % 500.0) - 250.0;
         }

-    	
-    	

+
+

         int flags = 0;
         flags += 1 << LCIOConstants.RCHBIT_TIME; //store hit time
         flags += 1 << LCIOConstants.RCHBIT_LONG; //store hit position; this flag has no effect for RawCalorimeterHits

@@ -196,11 +150,7 @@

 
                 for (RawTrackerHit hit : hits) {
                     CalorimeterHit newHit = converter.HitDtoA(hit);

-             
-                    // Get the channel data.
-                    EcalChannelConstants channelData = findChannel(newHit.getCellID());
-                    
-                    if (applyBadCrystalMap && channelData.isBadChannel()) {

+                    if (applyBadCrystalMap && isBadCrystal(newHit)) {

                         continue;
                     }
                     if (dropBadFADC && isBadFADC(newHit)) {

@@ -220,7 +170,6 @@

                         System.out.format("old hit energy %d\n", hit.getAmplitude());
                     }
                     CalorimeterHit newHit = converter.HitDtoA(hit, integralWindow, timeOffset);

-                    

                     if (newHit.getRawEnergy() > threshold) {
                         if (applyBadCrystalMap && isBadCrystal(newHit)) {
                             continue;

@@ -257,52 +206,4 @@

             }
         }
     }

-    
-    
-    /** 
-     * Convert physical ID to gain value.
-     * @param cellID (long)
-     * @return channel constants (EcalChannelConstants)
-     */
-    private static EcalChannelConstants findChannel(long cellID) {
-        // Make an ID object from raw hit ID.
-        IIdentifier id = new Identifier(cellID);
-        
-        // Get physical field values.
-        int system = helper.getValue(id, "system");
-        int x = helper.getValue(id, "ix");
-        int y = helper.getValue(id, "iy");
-        
-        // Create an ID to search for in channel collection.
-        GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-                
-        // Get the channel data.
-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));    
-    }
-    
-    /**
-     * Return crate number from cellID
-     * @param cellID (long)
-     * @return Crate number (int)
-     */
-    private int getCrate(long cellID) {
-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getCrate(helper, cellID);
-    }
-    
-    /**
-     * Return slot number from cellID
-     * @param cellID (long)
-     * @return Slot number (int)
-     */
-    private int getSlot(long cellID) {
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getSlot(helper, cellID);         
-    }
-    

 }

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalReadoutToTriggerConverterDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -3,19 +3,7 @@

 import java.util.ArrayList;
 import java.util.List;
 

-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.lcsim.detector.identifier.IIdentifierHelper;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.base.BaseRawCalorimeterHit;

@@ -29,12 +17,6 @@

  */
 public class EcalReadoutToTriggerConverterDriver extends Driver {
 

-	// To import database conditions
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null;
-	Detector detector = null;
-	

     String rawCollectionName = "EcalReadoutHits";
     String ecalReadoutName = "EcalHits";
     String ecalCollectionName = "EcalCalHits";

@@ -49,7 +31,6 @@

     private int triggerThreshold = 80;
     private double timeShift = 0;
     private int truncateScale = 128;

-    private static boolean isBadChannelLoaded = true;

 
     public EcalReadoutToTriggerConverterDriver() {
     }

@@ -95,30 +76,15 @@

 
     @Override
     public void detectorChanged(Detector detector) {

-    	this.detector = detector;
-    	
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for EcalReadoutToTriggerConverterDriver.");

     }
 
     public boolean isBadCrystal(CalorimeterHit hit) {

-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-    	
-        return isBadChannelLoaded ? channelData.isBadChannel() : false;

+        return EcalConditions.badChannelsLoaded() ? EcalConditions.isBadChannel(hit.getCellID()) : false;

     }
 
     public boolean isBadFADC(CalorimeterHit hit) {

-        return (getCrate(hit.getCellID()) == 1 && getSlot(hit.getCellID()) == 3);

+        long daqID = EcalConditions.physicalToDaqID(hit.getCellID());
+        return (EcalConditions.getCrate(daqID) == 1 && EcalConditions.getSlot(daqID) == 3);

     }
 
     @Override

@@ -146,12 +112,8 @@

     }
 
     public CalorimeterHit HitDtoA(BaseRawCalorimeterHit hit, int window) {

-    	
-        // Get the channel data.
-        EcalChannelConstants channelData = findChannel(hit.getCellID());
-    	

         double integral = tp * Math.E / readoutPeriod;

-        double readoutIntegral = (hit.getAmplitude() - window * channelData.getCalibration().getPedestal());

+        double readoutIntegral = (hit.getAmplitude() - window * EcalConditions.physicalToPedestal(hit.getCellID()));

         double amplitude = readoutIntegral / integral;
 
 //        double time = readoutPeriod * (Math.random() - 1);

@@ -206,8 +168,7 @@

         if (truncatedIntegral <= 0) {
             truncatedIntegral = 0;
         }

-        HPSCalorimeterHit h = new HPSCalorimeterHit(truncatedIntegral, hitTime, id, 0);
-        h.setDetector(detector);

+        CalorimeterHit h = new HPSCalorimeterHit(truncatedIntegral, hitTime, id, 0);

 //        CalorimeterHit h = new HPSRawCalorimeterHit(triggerIntegral + 0.0000001, hit.getPosition(), hitTime, id, 0);
         //+0.0000001 is a horrible hack to ensure rawEnergy!=BaseCalorimeterHit.UNSET_CORRECTED_ENERGY
         return h;

@@ -227,52 +188,4 @@

             }
         }
     }

-
-    /** 
-     * Convert physical ID to gain value.
-     * @param cellID (long)
-     * @return channel constants (EcalChannelConstants)
-     */
-    private static EcalChannelConstants findChannel(long cellID) {
-        // Make an ID object from raw hit ID.
-        IIdentifier id = new Identifier(cellID);
-        
-        // Get physical field values.
-        int system = helper.getValue(id, "system");
-        int x = helper.getValue(id, "ix");
-        int y = helper.getValue(id, "iy");
-        
-        // Create an ID to search for in channel collection.
-        GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-                
-        // Get the channel data.
-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));    
-    }  
-    
-    /**
-     * Return crate number from cellID
-     * @param cellID (long)
-     * @return Crate number (int)
-     */
-    private int getCrate(long cellID) {
-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getCrate(helper, cellID);
-    }
-    
-    /**
-     * Return slot number from cellID
-     * @param cellID (long)
-     * @return Slot number (int)
-     */
-    private int getSlot(long cellID) {
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getSlot(helper, cellID);         
-    }
-    
-    

 }

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTriggerFilterDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -5,18 +5,7 @@

 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 

-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel;
-import org.hps.conditions.ecal.EcalChannel.DaqId;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;

@@ -29,13 +18,6 @@

  */
 public class EcalTriggerFilterDriver extends Driver {
 

-	// To import database conditions
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null;
-    int systemId;
-    Detector detector = null;
-    

     private String ecalReadoutName = "EcalHits";
     private String inputCollection = "EcalReadoutHits";
     private String outputCollection = "EcalCalHits";

@@ -73,22 +55,6 @@

 
     @Override
     public void detectorChanged(Detector detector) {

-    	
-    	this.detector = detector;
-    	
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-
-        systemId = detector.getSubdetector("Ecal").getSystemID();
-        
-        System.out.println("You are now using the database conditions for EcalTriggerFilterDriver.");

     }
 
     @Override

@@ -119,19 +85,15 @@

         }
     }
 

-    /**
-     * This method takes input hits and makes new hits with different ix
-     * @param CalorimeterHit hit
-     * @return new HPSCalorimeterHit
-     */

     private CalorimeterHit filterHit(CalorimeterHit hit) {
         int ix = hit.getIdentifierFieldValue("ix");
         int iy = hit.getIdentifierFieldValue("iy");

-        int crate = getCrate(hit.getCellID());
-        int slot = getSlot(hit.getCellID());

+        long daqID = EcalConditions.physicalToDaqID(hit.getCellID());
+        int crate = EcalConditions.getCrate(daqID);
+        short slot = EcalConditions.getSlot(daqID);
+        short channel = EcalConditions.getChannel(daqID);

-        int delay = iy>0?topDelay:bottomDelay;  
-        

+        int delay = iy>0?topDelay:bottomDelay;

         // no triggers from crate 1, slot 3 
         if (crate == 1 && slot == 3) {
             return null;

@@ -141,43 +103,8 @@

         if (ix > 0 && iy > 0) {
             ix = 24 - ix;
         }

-     
-        int values[] = {systemId, ix, iy};
-        GeometryId geomId = new GeometryId(helper, values);       
-        // Creating the new channel from cell id, ix and iy, then reading its ID       
-        long newID = geomId.encode();      
-        

+        long newID = EcalConditions.makePhysicalID(ix, iy);

         //make new hit; set position to null so it gets recalculated

-        HPSCalorimeterHit h = new HPSCalorimeterHit(hit.getRawEnergy(), hit.getTime()+delay*4, newID, hit.getType());
-        h.setDetector(detector);
-        return h;

+        return new HPSCalorimeterHit(hit.getRawEnergy(), hit.getTime()+delay*4, newID, hit.getType());

     }

-    
-    /**
-     * Return crate number from cellID
-     * @param cellID (long)
-     * @return Crate number (int)
-     */
-    private int getCrate(long cellID) {
-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getCrate(helper, cellID);
-    }
-    
-    /**
-     * Return slot number from cellID
-     * @param cellID (long)
-     * @return Slot number (int)
-     */
-    private int getSlot(long cellID) {
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getSlot(helper, cellID);         
-    } 
- 
-    
-    

 }

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/FADCConverterDriver.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/FADCConverterDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -3,15 +3,7 @@

 import java.util.ArrayList;
 import java.util.List;
 

-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.base.BaseRawCalorimeterHit;

@@ -24,10 +16,6 @@

  */
 public class FADCConverterDriver extends Driver {
 

-    EcalConditions ecalConditions = null;
-    IIdentifierHelper helper = null;
-    EcalChannelCollection channels = null; 
-    EcalRawConverter converter = null;

     String rawCollectionName = "EcalReadoutHits";
     String ecalReadoutName = "EcalHits";
     String ecalCollectionName = "EcalIntegralHits";

@@ -71,18 +59,7 @@

     }
 
     @Override

-    public void detectorChanged(Detector detector) {        
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for FADCConverterDriver");

+    public void detectorChanged(Detector detector) {

     }
 
     @Override

@@ -97,12 +74,8 @@

             for (RawTrackerHit hit : hits) {
                 short[] window = hit.getADCValues();
                 long id = hit.getCellID();

-                
-                // Get the channel data.
-                EcalChannelConstants channelData = findChannel(id);
-                

                 //do DAQ readout

-                double crystalThreshold = channelData.getCalibration().getPedestal() + threshold;

+                double crystalThreshold = EcalConditions.physicalToPedestal(id) + threshold;

                 int adcSum = 0;
                 int pointerOffset = 0;
                 int numSamplesToRead = 0;

@@ -127,26 +100,4 @@

         int flags = 0;
         event.put(ecalCollectionName, readoutHits, BaseRawCalorimeterHit.class, flags, ecalReadoutName);
     }

-    
-    /** 
-     * Convert physical ID to gain value.
-     * @param cellID (long)
-     * @return channel constants (EcalChannelConstants)
-     */
-    private EcalChannelConstants findChannel(long cellID) {
-        // Make an ID object from raw hit ID.
-        IIdentifier id = new Identifier(cellID);
-        
-        // Get physical field values.
-        int system = helper.getValue(id, "system");
-        int x = helper.getValue(id, "ix");
-        int y = helper.getValue(id, "iy");
-        
-        // Create an ID to search for in channel collection.
-        GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-                
-        // Get the channel data.
-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));    
-    }
-    

 }

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/FADCPrimaryTriggerDriver.java	                        (rev 0)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/FADCPrimaryTriggerDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -0,0 +1,889 @@

+package org.hps.readout.ecal;
+
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.lcsim.event.EventHeader;
+import org.lcsim.util.aida.AIDA;
+
+/**
+ * Class <code>FADCPrimaryTriggerDriver</code> reads reconstructed
+ * clusters and makes trigger decisions on them. It is designed to
+ * trigger off 2.2 GeV beam A' events. Cuts can either be set manually
+ * in a steering file or automatically by specifying a background level.
+ * The code for generating trigger pairs and handling the coincidence
+ * window comes from <code>FADCTriggerDriver</code>.
+ * 
+ * @author Kyle McCarty
+ * @see FADCTriggerDriver
+ */
+public class FADCPrimaryTriggerDriver extends TriggerDriver {
+    // ==================================================================
+    // ==== Trigger Cut Default Parameters ==============================
+    // ==================================================================
+    private int minHitCount = 1;								// Minimum required cluster hit count threshold. (Hits)			
+    private double seedEnergyHigh = Double.MAX_VALUE;			// Maximum allowed cluster seed energy. (GeV)
+    private double seedEnergyLow = Double.MIN_VALUE;			// Minimum required cluster seed energy. (GeV)
+    private double clusterEnergyHigh = 1.5 * ECalUtils.GeV;		// Maximum allowed cluster total energy. (GeV)
+    private double clusterEnergyLow = .1 * ECalUtils.GeV;		// Minimum required cluster total energy. (GeV)
+    private double energySumHigh = 1.9 * ECalUtils.GeV;			// Maximum allowed pair energy sum. (GeV)
+    private double energySumLow = 0.0 * ECalUtils.GeV;			// Minimum required pair energy sum. (GeV)
+    private double energyDifferenceHigh = 2.2 * ECalUtils.GeV;	// Maximum allowed pair energy difference. (GeV)
+    private double energySlopeLow = 1.1;						// Minimum required pair energy slope value.
+    private double coplanarityHigh = 35;						// Maximum allowed pair coplanarity deviation. (Degrees)
+    
+    // ==================================================================
+    // ==== Trigger General Default Parameters ==========================
+    // ==================================================================
+    private String clusterCollectionName = "EcalClusters";		// Name for the LCIO cluster collection.
+    private int pairCoincidence = 2;							// Maximum allowed time difference between clusters. (4 ns clock-cycles)
+    private double energySlopeParamF = 0.005500;				// A parameter value used for the energy slope calculation.
+    private double originX = 1393.0 * Math.tan(0.03052);		// ECal mid-plane, defined by photon beam position (30.52 mrad) at ECal face (z=1393 mm)
+    private int backgroundLevel = -1;							// Automatically sets the cuts to achieve a predetermined background rate.
+    
+    // ==================================================================
+    // ==== Driver Internal Variables ===================================
+    // ==================================================================
+    private Queue<List<HPSEcalCluster>> topClusterQueue = null;	// Store clusters on the top half of the calorimeter.
+    private Queue<List<HPSEcalCluster>> botClusterQueue = null;	// Store clusters on the bottom half of the calorimeter.
+    private int allClusters = 0;								// Track the number of clusters processed.
+    private int allPairs = 0;									// Track the number of cluster pairs processed.
+    private int clusterTotalEnergyCount = 0;					// Track the clusters which pass the total energy cut.
+    private int clusterSeedEnergyCount = 0;						// Track the clusters which pass the seed energy cut.
+    private int clusterHitCountCount = 0;						// Track the clusters which pass the hit count cut.
+    private int pairEnergySumCount = 0;							// Track the pairs which pass the energy sum cut.
+    private int pairEnergyDifferenceCount = 0;					// Track the pairs which pass the energy difference cut.
+    private int pairEnergySlopeCount = 0;						// Track the pairs which pass the energy slope cut.
+    private int pairCoplanarityCount = 0;						// Track the pairs which pass the coplanarity cut.
+    
+    // ==================================================================
+    // ==== Trigger Distribution Plots ==================================
+    // ==================================================================
+	private AIDA aida = AIDA.defaultInstance();
+    IHistogram1D clusterSeedEnergy = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution", 176, 0.0, 2.2);
+    IHistogram1D clusterSeedEnergy100 = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution (Over 100 MeV)", 176, 0.0, 2.2);
+    IHistogram1D clusterSeedEnergySingle = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution (Passed Single Cuts)", 176, 0.0, 2.2);
+    IHistogram1D clusterSeedEnergyAll = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution (Passed All Cuts)", 176, 0.0, 2.2);
+    IHistogram1D clusterHitCount = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution", 9, 1, 10);
+    IHistogram1D clusterHitCount100 = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution (Over 100 MeV)", 9, 1, 10);
+    IHistogram1D clusterHitCountSingle = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution (Passed Single Cuts)", 9, 1, 10);
+    IHistogram1D clusterHitCountAll = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution (Passed All Cuts)", 9, 1, 10);
+    IHistogram1D clusterTotalEnergy = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution", 176, 0.0, 2.2);
+    IHistogram1D clusterTotalEnergy100 = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution (Over 100 MeV)", 176, 0.0, 2.2);
+    IHistogram1D clusterTotalEnergySingle = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution (Passed Single Cuts)", 176, 0.0, 2.2);
+    IHistogram1D clusterTotalEnergyAll = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution (Passed All Cuts)", 176, 0.0, 2.2);
+    
+    IHistogram1D pairEnergySum = aida.histogram1D("Trigger Plots :: Pair Energy Sum Distribution", 176, 0.0, 4.4);
+    IHistogram1D pairEnergySumAll = aida.histogram1D("Trigger Plots :: Pair Energy Sum Distribution (Passed All Cuts)", 176, 0.0, 4.4);    
+    IHistogram1D pairEnergyDifference = aida.histogram1D("Trigger Plots :: Pair Energy Difference Distribution", 176, 0.0, 2.2);
+    IHistogram1D pairEnergyDifferenceAll = aida.histogram1D("Trigger Plots :: Pair Energy Difference Distribution (Passed All Cuts)", 176, 0.0, 2.2);
+    IHistogram1D pairCoplanarity = aida.histogram1D("Trigger Plots :: Pair Coplanarity Distribution", 360, 0.0, 180.0);
+    IHistogram1D pairCoplanarityAll = aida.histogram1D("Trigger Plots :: Pair Coplanarity Distribution (Passed All Cuts)", 360, 0.0, 180.0);
+    IHistogram1D pairEnergySlope = aida.histogram1D("Trigger Plots :: Pair Energy Slope Distribution", 400, 0.0, 4.0);
+    IHistogram1D pairEnergySlopeAll = aida.histogram1D("Trigger Plots :: Pair Energy Slope Distribution (Passed All Cuts)", 400, 0.0, 4.0);
+    
+	IHistogram2D clusterDistribution = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution", 44, -22.0, 22.0, 10, -5, 5);
+	IHistogram2D clusterDistribution100 = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution (Over 100 MeV)", 44, -23, 23, 11, -5.5, 5.5);
+	IHistogram2D clusterDistributionSingle = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution (Passed Single Cuts)", 44, -23, 23, 11, -5.5, 5.5);
+	IHistogram2D clusterDistributionAll = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution (Passed All Cuts)", 44, -23, 23, 11, -5.5, 5.5);
+    
+    /**
+     * Prints out the results of the trigger at the end of the run.
+     */
+    @Override
+    public void endOfData() {
+    	// Print out the results of the trigger cuts.
+    	System.out.printf("Trigger Processing Results%n");
+    	System.out.printf("\tSingle-Cluster Cuts%n");
+    	System.out.printf("\t\tTotal Clusters Processed     :: %d%n", allClusters);
+    	System.out.printf("\t\tPassed Seed Energy Cut       :: %d%n", clusterSeedEnergyCount);
+    	System.out.printf("\t\tPassed Hit Count Cut         :: %d%n", clusterHitCountCount);
+    	System.out.printf("\t\tPassed Total Energy Cut      :: %d%n", clusterTotalEnergyCount);
+    	System.out.printf("%n");
+    	System.out.printf("\tCluster Pair Cuts%n");
+    	System.out.printf("\t\tTotal Pairs Processed        :: %d%n", allPairs);
+    	System.out.printf("\t\tPassed Energy Sum Cut        :: %d%n", pairEnergySumCount);
+    	System.out.printf("\t\tPassed Energy Difference Cut :: %d%n", pairEnergyDifferenceCount);
+    	System.out.printf("\t\tPassed Energy Slope Cut      :: %d%n", pairEnergySlopeCount);
+    	System.out.printf("\t\tPassed Coplanarity Cut       :: %d%n", pairCoplanarityCount);
+    	System.out.printf("%n");
+    	System.out.printf("\tTrigger Count :: %d%n", numTriggers);
+    	
+    	// Run the superclass method.
+        super.endOfData();
+    }
+    
+    /**
+     * Performs single cluster cuts for the event and passes any clusters
+     * which survive to be formed into cluster pairs for the trigger.
+     */
+    @Override
+    public void process(EventHeader event) {
+    	// Process the list of clusters for the event, if it exists.
+        if (event.hasCollection(HPSEcalCluster.class, clusterCollectionName)) {
+        	// Get the collection of clusters.
+        	List<HPSEcalCluster> clusterList = event.get(HPSEcalCluster.class, clusterCollectionName);
+        	
+        	// Create a list to hold clusters which pass the single
+        	// cluster cuts.
+        	List<HPSEcalCluster> goodClusterList = new ArrayList<HPSEcalCluster>(clusterList.size());
+        	
+        	// Sort through the cluster list and add clusters that pass
+        	// the single cluster cuts to the good list.
+        	clusterLoop:
+        	for(HPSEcalCluster cluster : clusterList) {
+        		// Increment the number of processed clusters.
+        		allClusters++;
+        		
+        		// Get the cluster plot values.
+        		int hitCount = cluster.getCalorimeterHits().size();
+        		double seedEnergy = cluster.getSeedHit().getCorrectedEnergy();
+        		double clusterEnergy = cluster.getEnergy();
+        		int ix = cluster.getSeedHit().getIdentifierFieldValue("ix");
+        		int iy = cluster.getSeedHit().getIdentifierFieldValue("iy");
+        		if(ix > 0) { ix = ix - 1; }
+        		
+        		// Fill the general plots.
+        		clusterSeedEnergy.fill(seedEnergy, 1);
+        		clusterTotalEnergy.fill(clusterEnergy, 1);
+        		clusterHitCount.fill(hitCount, 1);
+        		clusterDistribution.fill(ix, iy, 1);
+        		
+        		// Fill the "over 100 MeV" plots if applicable.
+        		if(seedEnergy >= 0.100) {
+            		clusterSeedEnergy100.fill(seedEnergy, 1);
+            		clusterTotalEnergy100.fill(clusterEnergy, 1);
+            		clusterHitCount100.fill(hitCount, 1);
+            		clusterDistribution100.fill(ix, iy, 1);
+        		}
+        		
+        		// ==== Seed Hit Energy Cut ====================================
+        		// =============================================================
+        		// If the cluster fails the cut, skip to the next cluster.
+        		if(!clusterSeedEnergyCut(cluster)) { continue clusterLoop; }
+        		
+        		// Otherwise, note that it passed the cut.
+        		clusterSeedEnergyCount++;
+        		
+        		// ==== Cluster Hit Count Cut ==================================
+        		// =============================================================
+        		// If the cluster fails the cut, skip to the next cluster.
+        		if(!clusterHitCountCut(cluster)) { continue clusterLoop; }
+        		
+        		// Otherwise, note that it passed the cut.
+        		clusterHitCountCount++;
+        		
+        		// ==== Cluster Total Energy Cut ===============================
+        		// =============================================================
+        		// If the cluster fails the cut, skip to the next cluster.
+        		if(!clusterTotalEnergyCut(cluster)) { continue clusterLoop; }
+        		
+        		// Otherwise, note that it passed the cut.
+        		clusterTotalEnergyCount++;
+        		
+        		// Fill the "passed single cuts" plots.
+        		clusterSeedEnergySingle.fill(seedEnergy, 1);
+        		clusterTotalEnergySingle.fill(clusterEnergy, 1);
+        		clusterHitCountSingle.fill(hitCount, 1);
+        		clusterDistributionSingle.fill(ix, iy, 1);
+        		
+        		// A cluster that passes all of the single-cluster cuts
+        		// can be used in cluster pairs.
+        		goodClusterList.add(cluster);
+        	}
+        	
+        	// Put the good clusters into the cluster queue.
+        	updateClusterQueues(goodClusterList);
+        }
+        
+        // Perform the superclass event processing.
+        super.process(event);
+    }
+    
+    /**
+     * Sets the trigger cuts automatically to a given background level.
+     * 
+     * @param backgroundLevel - The level to which the background should
+     * be set. Actual background rates equal about (5 * backgroundLevel) kHz.
+     */
+    public void setBackgroundLevel(int backgroundLevel) {
+    	this.backgroundLevel = backgroundLevel;
+    }
+    
+    /**
+     * Sets the name of the LCIO collection that contains the clusters.
+     * 
+     * @param clusterCollectionName - The cluster LCIO collection name.
+     */
+    public void setClusterCollectionName(String clusterCollectionName) {
+        this.clusterCollectionName = clusterCollectionName;
+    }
+    
+    /**
+     * Sets the highest allowed energy a cluster may have and still
+     * pass the cluster total energy single cluster cut. Value uses
+     * units of GeV.
+     *
+     * @param clusterEnergyHigh - The parameter value.
+     */
+    public void setClusterEnergyHigh(double clusterEnergyHigh) {
+        this.clusterEnergyHigh = clusterEnergyHigh * ECalUtils.GeV;
+    }
+    
+    /**
+     * Sets the lowest allowed energy a cluster may have and still
+     * pass the cluster total energy single cluster cut. Value uses
+     * units of GeV.
+     *
+     * @param clusterEnergyLow - The parameter value.
+     */
+    public void setClusterEnergyLow(double clusterEnergyLow) {
+        this.clusterEnergyLow = clusterEnergyLow * ECalUtils.GeV;
+    }
+    
+    /**
+     * Sets the maximum deviation from coplanarity that a cluster pair
+     * may possess and still pass the coplanarity pair cut. Value uses
+     * units of degrees.
+     *
+     * @param maxCoplanarityAngle - The parameter value.
+     */
+    public void setCoplanarityHigh(double coplanarityHigh) {
+        this.coplanarityHigh = coplanarityHigh;
+    }
+    
+    /**
+     * Sets the highest allowed energy difference a cluster pair may
+     * have and still pass the cluster pair energy difference cut.
+     * Value uses units of GeV.
+     *
+     * @param energyDifferenceHigh - The parameter value.
+     */
+    public void setEnergyDifferenceHigh(double energyDifferenceHigh) {
+        this.energyDifferenceHigh = energyDifferenceHigh * ECalUtils.GeV;
+    }
+    
+    /**
+     * Sets the lowest allowed energy slope a cluster pair may
+     * have and still pass the cluster pair energy slope cut.
+     *
+     * @param energySlopeLow - The parameter value.
+     */
+    public void setEnergySlopeLow(double energySlopeLow) {
+    	this.energySlopeLow = energySlopeLow;
+    }
+    
+    /**
+     * Sets the highest allowed energy a cluster pair may have and
+     * still pass the cluster pair energy sum cluster cut. Value uses
+     * units of GeV.
+     *
+     * @param energySumHigh - The parameter value.
+     */
+    public void setEnergySumHigh(double energySumHigh) {
+        this.energySumHigh = energySumHigh * ECalUtils.GeV;
+    }
+    
+    /**
+     * Sets the lowest allowed energy a cluster pair may have and
+     * still pass the cluster pair energy sum cluster cut. Value uses
+     * units of GeV.
+     *
+     * @param energySumHigh - The parameter value.
+     */
+    public void setEnergySumLow(double energySumLow) {
+        this.energySumLow = energySumLow * ECalUtils.GeV;
+    }
+    
+    /**
+     * Sets the minimum number of hits needed for a cluster to pass
+     * the hit count single cluster cut.
+     *
+     * @param minHitCount - The parameter value.
+     */
+    public void setMinHitCount(int minHitCount) {
+        this.minHitCount = minHitCount;
+    }
+    
+    /**
+     * Sets X coordinate used as the origin for cluster coplanarity and
+     * slope calculations. This defaults to the calorimeter mid-plane
+     * and is in units of millimeters.
+     *
+     * @param originX - The parameter value.
+     */
+    public void setOriginX(double originX) {
+        this.originX = originX;
+    }
+    
+    /**
+     * Sets the time range over which cluster pairs will be formed.
+     * Value uses units of clock-cycles. Note that the number of
+     * clock-cycles used is calculated as (2 * pairCoincidence) + 1.
+     * 
+     * @param pairCoincidence - The parameter value.
+     */
+    public void setPairCoincidence(int pairCoincidence) {
+        this.pairCoincidence = pairCoincidence;
+    }
+    
+    /**
+     * Sets the highest allowed energy a seed hit may have and still
+     * pass the seed hit energy single cluster cut. Value uses units
+     * of GeV.
+     *
+     * @param seedEnergyHigh - The parameter value.
+     */
+    public void setSeedEnergyHigh(double seedEnergyHigh) {
+        this.seedEnergyHigh = seedEnergyHigh * ECalUtils.GeV;
+    }
+    
+    /**
+     * Sets the lowest allowed energy a seed hit may have and still
+     * pass the seed hit energy single cluster cut. Value uses units
+     * of GeV.
+     *
+     * @param seedEnergyLow - The parameter value.
+     */
+    public void setSeedEnergyLow(double seedEnergyLow) {
+        this.seedEnergyLow = seedEnergyLow * ECalUtils.GeV;
+    }
+    
+    /**
+     * Initializes the cluster pair queues and other variables.
+     */
+    @Override
+    public void startOfData() {
+    	// Make sure that a valid cluster collection name has been
+    	// defined. If it has not, throw an exception.
+        if (clusterCollectionName == null) {
+            throw new RuntimeException("The parameter clusterCollectionName was not set!");
+        }
+    	
+        // Initialize the top and bottom cluster queues.
+        topClusterQueue = new LinkedList<List<HPSEcalCluster>>();
+        botClusterQueue = new LinkedList<List<HPSEcalCluster>>();
+        
+        // Populate the top cluster queue. It should be populated with
+        // a number of empty lists equal to (2 * pairCoincidence + 1).
+        for (int i = 0; i < 2 * pairCoincidence + 1; i++) {
+            topClusterQueue.add(new ArrayList<HPSEcalCluster>());
+        }
+        
+        // Populate the bottom cluster queue. It should be populated with
+        // a number of empty lists equal to (2 * pairCoincidence + 1).
+        for (int i = 0; i < pairCoincidence + 1; i++) {
+            botClusterQueue.add(new ArrayList<HPSEcalCluster>());
+        }
+        
+        // If a background level has been set, pick the correct cuts.
+        if(backgroundLevel != -1) { setBackgroundCuts(backgroundLevel); }
+        
+        // Run the superclass method.
+        super.startOfData();
+    }
+
+    /**
+     * Get a list of all unique cluster pairs in the event
+     *
+     * @param ecalClusters : List of ECal clusters
+     * @return list of cluster pairs
+     */
+    protected List<HPSEcalCluster[]> getClusterPairsTopBot() {
+        // Create a list to store cluster pairs. 
+        List<HPSEcalCluster[]> clusterPairs = new ArrayList<HPSEcalCluster[]>();
+        
+        // Loop over all top-bottom pairs of clusters; higher-energy cluster goes first in the pair
+        // To apply pair coincidence time, use only bottom clusters from the 
+        // readout cycle pairCoincidence readout cycles ago, and top clusters 
+        // from all 2*pairCoincidence+1 previous readout cycles
+        for (HPSEcalCluster botCluster : botClusterQueue.element()) {
+            for (List<HPSEcalCluster> topClusters : topClusterQueue) {
+                for (HPSEcalCluster topCluster : topClusters) {
+                	// The first cluster in a pair should always be
+                	// the higher energy cluster. If the top cluster
+                	// is higher energy, it goes first.
+                    if (topCluster.getEnergy() > botCluster.getEnergy()) {
+                        HPSEcalCluster[] clusterPair = {topCluster, botCluster};
+                        clusterPairs.add(clusterPair);
+                    }
+                    
+                    // Otherwise, the bottom cluster goes first.
+                    else {
+                        HPSEcalCluster[] clusterPair = {botCluster, topCluster};
+                        clusterPairs.add(clusterPair);
+                    }
+                }
+            }
+        }
+        
+        // Return the cluster pair lists.
+        return clusterPairs;
+    }
+    
+	/**
+	 * Determines if the event produces a trigger.
+	 * 
+	 * @return Returns <code>true</code> if the event produces a trigger
+	 * and <code>false</code> if it does not.
+	 */
+	@Override
+	protected boolean triggerDecision(EventHeader event) {
+    	// If there is a list of clusters present for this event,
+    	// check whether it passes the trigger conditions.
+    	if (event.hasCollection(HPSEcalCluster.class, clusterCollectionName)) {
+        	return testTrigger();
+        }
+        
+        // Otherwise, this event can not produce a trigger and should
+        // return false automatically.
+        else { return false; }
+	}
+    
+    /**
+     * Checks whether the argument cluster possesses the minimum
+     * allowed hits.
+     * 
+     * @param cluster - The cluster to check.
+     * @return Returns <code>true</code> if the cluster passes the cut
+     * and <code>false</code> if the cluster does not.
+     */
+    private boolean clusterHitCountCut(HPSEcalCluster cluster) {
+    	return (getValueClusterHitCount(cluster) >= minHitCount);
+    }
+    
+    /**
+     * Checks whether the argument cluster seed hit falls within the
+     * allowed seed hit energy range.
+     * 
+     * @param cluster - The cluster to check.
+     * @return Returns <code>true</code> if the cluster passes the cut
+     * and <code>false</code> if the cluster does not.
+     */
+    private boolean clusterSeedEnergyCut(HPSEcalCluster cluster) {
+    	// Get the cluster seed energy.
+    	double energy = getValueClusterSeedEnergy(cluster);
+    	
+    	// Check that it is above the minimum threshold and below the
+    	// maximum threshold.
+    	return (energy < seedEnergyHigh) && (energy > seedEnergyLow);
+    }
+    
+    /**
+     * Checks whether the argument cluster falls within the allowed
+     * cluster total energy range.
+     * 
+     * @param cluster - The cluster to check.
+     * @return Returns <code>true</code> if the cluster passes the cut
+     * and <code>false</code> if the cluster does not.
+     */
+    private boolean clusterTotalEnergyCut(HPSEcalCluster cluster) {
+    	// Get the total cluster energy.
+    	double energy = getValueClusterTotalEnergy(cluster);
+    	
+    	// Check that it is above the minimum threshold and below the
+    	// maximum threshold.
+    	return (energy < clusterEnergyHigh) && (energy > clusterEnergyLow);
+    }
+    
+    /**
+     * Calculates the distance between two clusters.
+     * 
+     * @param clusterPair - The cluster pair from which the value should
+     * be calculated.
+     * @return Returns the distance between the clusters.
+     */
+    private double getClusterDistance(HPSEcalCluster cluster) {
+        return Math.hypot(cluster.getSeedHit().getPosition()[0] - originX, cluster.getSeedHit().getPosition()[1]);
+    }
+    
+    /**
+     * Gets the value used for the cluster total energy cut.
+     * 
+     * @param cluster - The cluster from which the value should be
+     * derived.
+     * @return Returns the cut value.
+     */
+    private double getValueClusterTotalEnergy(HPSEcalCluster cluster) {
+    	return cluster.getEnergy();
+    }
+    
+    /**
+     * Gets the value used for the cluster hit count cut.
+     * 
+     * @param cluster - The cluster from which the value should be
+     * derived.
+     * @return Returns the cut value.
+     */
+    private int getValueClusterHitCount(HPSEcalCluster cluster) {
+    	return cluster.getCalorimeterHits().size();
+    }
+    
+    /**
+     * Gets the value used for the seed hit energy cut.
+     * 
+     * @param cluster - The cluster from which the value should be
+     * derived.
+     * @return Returns the cut value.
+     */
+    private double getValueClusterSeedEnergy(HPSEcalCluster cluster) {
+    	return cluster.getSeedHit().getCorrectedEnergy();
+    }
+    
+    /**
+     * Calculates the value used by the coplanarity cut.
+     * 
+     * @param clusterPair - The cluster pair from which the value should
+     * be calculated.
+     * @return Returns the cut value.
+     */
+    private double getValueCoplanarity(HPSEcalCluster[] clusterPair) {
+    	// Get the cluster angles.
+    	double[] clusterAngle = new double[2];
+    	for(int i = 0; i < 2; i++) {
+            double position[] = clusterPair[i].getSeedHit().getPosition();
+            clusterAngle[i] = (Math.toDegrees(Math.atan2(position[1], position[0] - originX)) + 180.0) % 180.0;
+    	}
+    	
+    	// Calculate the coplanarity cut value.
+        return Math.abs(clusterAngle[1] - clusterAngle[0]);
+    }
+    
+    /**
+     * Calculates the value used by the energy difference cut.
+     * 
+     * @param clusterPair - The cluster pair from which the value should
+     * be calculated.
+     * @return Returns the cut value.
+     */
+    private double getValueEnergyDifference(HPSEcalCluster[] clusterPair) {
+    	return clusterPair[0].getEnergy() - clusterPair[1].getEnergy();
+    }
+    
+    /**
+     * Calculates the value used by the energy slope cut.
+     * 
+     * @param clusterPair - The cluster pair from which the value should
+     * be calculated.
+     * @return Returns the cut value.
+     */
+    private double getValueEnergySlope(HPSEcalCluster[] clusterPair) {
+    	// E + R*F
+    	// Get the low energy cluster energy.
+    	double slopeParamE = clusterPair[1].getEnergy();
+    	
+    	// Get the low energy cluster radial distance.
+    	double slopeParamR = getClusterDistance(clusterPair[1]);
+    	
+    	// Calculate the energy slope.
+    	return slopeParamE + slopeParamR * energySlopeParamF;
+    }
+    
+    /**
+     * Calculates the value used by the energy sum cut.
+     * 
+     * @param clusterPair - The cluster pair from which the value should
+     * be calculated.
+     * @return Returns the cut value.
+     */
+    private double getValueEnergySum(HPSEcalCluster[] clusterPair) {
+    	return clusterPair[0].getEnergy() + clusterPair[1].getEnergy();
+    }
+    
+    /**
+     * Checks if a cluster pair is coplanar to the beam within a given
+     * angle.
+     *
+     * @param clusterPair - The cluster pair to check.
+     * @return Returns <code>true</code> if the cluster pair passes
+     * the cut and <code>false</code> if it does not.
+     */
+    private boolean pairCoplanarityCut(HPSEcalCluster[] clusterPair) {
+        return (getValueCoplanarity(clusterPair) < coplanarityHigh);
+    }
+    
+    /**
+     * Checks if the energy difference between the clusters making up
+     * a cluster pair is below an energy difference threshold.
+     *
+     * @param clusterPair - The cluster pair to check.
+     * @return Returns <code>true</code> if the cluster pair passes
+     * the cut and <code>false</code> if it does not.
+     */
+    private boolean pairEnergyDifferenceCut(HPSEcalCluster[] clusterPair) {
+        return (getValueEnergyDifference(clusterPair) < energyDifferenceHigh);
+    }
+    
+    /**
+     * Requires that the distance from the beam of the lowest energy
+     * cluster in a cluster pair satisfies the following:
+     * E_low + d_b*.0032 GeV/mm < [ Threshold ]
+     *
+     * @param clusterPair : pair of clusters
+     * @return true if pair is found, false otherwise
+     */
+    private boolean pairEnergySlopeCut(HPSEcalCluster[] clusterPair) {
+    	return (getValueEnergySlope(clusterPair) > energySlopeLow);
+    }
+    
+    /**
+     * Checks if the sum of the energies of clusters making up a cluster
+     * pair is below an energy sum threshold.
+     *
+     * @param clusterPair - The cluster pair to check.
+     * @return Returns <code>true</code> if the cluster pair passes
+     * the cut and <code>false</code> if it does not.
+     */
+    private boolean pairEnergySumCut(HPSEcalCluster[] clusterPair) {
+    	// Get the energy sum value.
+    	double energySum = getValueEnergySum(clusterPair);
+    	
+    	// Check that it is within the allowed range.
+        return (energySum < energySumHigh) && (energySum > energySumLow);
+    }
+	
+    private void setBackgroundCuts(int backgroundLevel) {
+    	// Make sure that the background level is valid.
+    	if(backgroundLevel < 1 || backgroundLevel > 10) {
+    		throw new RuntimeException(String.format("Trigger cuts are undefined for background level %d.", backgroundLevel));
+    	}
+    	
+    	// Otherwise, set the trigger cuts. Certain cuts are constant
+    	// across all background levels.
+    	clusterEnergyLow = 0.000;
+    	seedEnergyLow = 0.100;
+    	
+    	// Set the variable values.
+    	if(backgroundLevel == 1) {
+    		clusterEnergyHigh = 1.700;
+    		seedEnergyHigh = 1.300;
+    		energySumLow = 0.400;
+    		energySumHigh = 2.00;
+    		energyDifferenceHigh = 1.500;
+    		energySlopeLow = 1.0;
+    		coplanarityHigh = 40;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 2) {
+    		clusterEnergyHigh = 1.600;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.300;
+    		energySumHigh = 2.00;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.8;
+    		coplanarityHigh = 40;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 3) {
+    		clusterEnergyHigh = 1.600;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.200;
+    		energySumHigh = 2.000;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.7;
+    		coplanarityHigh = 40;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 4) {
+    		clusterEnergyHigh = 1.500;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.500;
+    		energySumHigh = 1.950;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.6;
+    		coplanarityHigh = 40;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 5) {
+    		clusterEnergyHigh = 1.500;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.400;
+    		energySumHigh = 2.000;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.6;
+    		coplanarityHigh = 45;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 6) {
+    		clusterEnergyHigh = 1.500;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.200;
+    		energySumHigh = 1.950;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.6;
+    		coplanarityHigh = 55;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 7) {
+    		clusterEnergyHigh = 1.700;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.200;
+    		energySumHigh = 2.000;
+    		energyDifferenceHigh = 1.500;
+    		energySlopeLow = 0.6;
+    		coplanarityHigh = 60;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 8) {
+    		clusterEnergyHigh = 1.700;
+    		seedEnergyHigh = 1.300;
+    		energySumLow = 0.200;
+    		energySumHigh = 2.000;
+    		energyDifferenceHigh = 1.500;
+    		energySlopeLow = 0.6;
+    		coplanarityHigh = 65;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 9) {
+    		clusterEnergyHigh = 1.500;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.400;
+    		energySumHigh = 1.950;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.5;
+    		coplanarityHigh = 60;
+    		minHitCount = 2;
+    	} else if(backgroundLevel == 10) {
+    		clusterEnergyHigh = 1.500;
+    		seedEnergyHigh = 1.200;
+    		energySumLow = 0.400;
+    		energySumHigh = 2.000;
+    		energyDifferenceHigh = 1.400;
+    		energySlopeLow = 0.5;
+    		coplanarityHigh = 65;
+    		minHitCount = 2;
+    	}
+    }
+    
+	/**
+	 * Tests all of the current cluster pairs for triggers.
+	 * 
+	 * @return Returns <code>true</code> if one of the cluster pairs
+	 * passes all of the cluster cuts and <code>false</code> otherwise.
+	 */
+    private boolean testTrigger() {
+    	// Get the list of cluster pairs.
+    	List<HPSEcalCluster[]> clusterPairs = getClusterPairsTopBot();
+        
+        // Iterate over the cluster pairs and perform each of the cluster
+        // pair cuts on them. A cluster pair that passes all of the
+        // cuts registers as a trigger.
+    	pairLoop:
+        for (HPSEcalCluster[] clusterPair : clusterPairs) {
+    		// Increment the number of processed cluster pairs.
+    		allPairs++;
+    		
+    		// Get the plot values for the pair cuts.
+    		double energySum = getValueEnergySum(clusterPair);
+    		double energyDifference = getValueEnergyDifference(clusterPair);
+    		double energySlope = getValueEnergySlope(clusterPair);
+    		double coplanarity = getValueCoplanarity(clusterPair);
+    		
+    		// Fill the general plots.
+    		pairEnergySum.fill(energySum, 1);
+    		pairEnergyDifference.fill(energyDifference, 1);
+    		pairEnergySlope.fill(energySlope, 1);
+    		pairCoplanarity.fill(coplanarity, 1);
+    		
+    		// ==== Pair Energy Sum Cut ====================================
+    		// =============================================================
+    		// If the cluster fails the cut, skip to the next pair.
+    		if(!pairEnergySumCut(clusterPair)) { continue pairLoop; }
+    		
+    		// Otherwise, note that it passed the cut.
+    		pairEnergySumCount++;
+        	
+    		// ==== Pair Energy Difference Cut =============================
+    		// =============================================================
+    		// If the cluster fails the cut, skip to the next pair.
+    		if(!pairEnergyDifferenceCut(clusterPair)) { continue pairLoop; }
+    		
+    		// Otherwise, note that it passed the cut.
+    		pairEnergyDifferenceCount++;
+    		
+    		// ==== Pair Energy Slope Cut ==================================
+    		// =============================================================
+    		// If the cluster fails the cut, skip to the next pair.
+    		//if(!energyDistanceCut(clusterPair)) { continue pairLoop; }
+    		if(!pairEnergySlopeCut(clusterPair)) { continue pairLoop; }
+    		
+    		// Otherwise, note that it passed the cut.
+    		pairEnergySlopeCount++;
+    		
+    		// ==== Pair Coplanarity Cut ===================================
+    		// =============================================================
+    		// If the cluster fails the cut, skip to the next pair.
+    		if(!pairCoplanarityCut(clusterPair)) { continue pairLoop; }
+    		
+    		// Otherwise, note that it passed the cut.
+    		pairCoplanarityCount++;
+    		
+    		// Get the cluster plot values.
+    		int[] hitCount = new int[2];
+    		double[] seedEnergy = new double[2];
+    		double[] clusterEnergy = new double[2];
+    		int[] ix = new int[2];
+    		int[] iy = new int[2];
+    		for(int i = 0; i < 2; i++) {
+    			hitCount[i] = clusterPair[i].getCalorimeterHits().size();
+    			seedEnergy[i] = clusterPair[i].getSeedHit().getCorrectedEnergy();
+    			clusterEnergy[i] = clusterPair[i].getEnergy();
+    			ix[i] = clusterPair[i].getSeedHit().getIdentifierFieldValue("ix");
+    			iy[i] = clusterPair[i].getSeedHit().getIdentifierFieldValue("iy");
+    			if(ix[i] > 0) { ix[i] = ix[i] - 1; }
+    		}
+    		
+    		// Fill the general plots.
+    		for(int i = 0; i < 2; i++) {
+	    		clusterSeedEnergyAll.fill(seedEnergy[i], 1);
+	    		clusterTotalEnergyAll.fill(clusterEnergy[i], 1);
+	    		clusterHitCountAll.fill(hitCount[i], 1);
+	    		clusterDistributionAll.fill(ix[i], iy[i], 1);
+    		}
+    		
+    		// Fill the "passed all cuts" plots.
+    		pairEnergySumAll.fill(energySum, 1);
+    		pairEnergyDifferenceAll.fill(energyDifference, 1);
+    		pairEnergySlopeAll.fill(energySlope, 1);
+    		pairCoplanarityAll.fill(coplanarity, 1);
+    		
+    		// Clusters that pass all of the pair cuts produce a trigger.
+    		return true;
+        }
+        
+        // If the loop terminates without producing a trigger, there
+    	// are no cluster pairs which meet the trigger conditions.
+        return false;
+    }
+    
+    /**
+     * Adds clusters from a new event into the top and bottom cluster
+     * queues so that they may be formed into pairs.
+     * 
+     * @param clusterList - The clusters to add to the queues.
+     */
+    private void updateClusterQueues(List<HPSEcalCluster> clusterList) {
+    	// Create lists to store the top and bottom clusters.
+        ArrayList<HPSEcalCluster> topClusterList = new ArrayList<HPSEcalCluster>();
+        ArrayList<HPSEcalCluster> botClusterList = new ArrayList<HPSEcalCluster>();
+        
+        // Loop over the clusters in the cluster list.
+        for (HPSEcalCluster cluster : clusterList) {
+        	// If the cluster is on the top of the calorimeter, it
+        	// goes into the top cluster list.
+            if (cluster.getSeedHit().getIdentifierFieldValue("iy") > 0) {
+                topClusterList.add(cluster);
+            }
+            
+            // Otherwise, it goes into the bottom cluster list.
+            else { botClusterList.add(cluster); }
+        }
+        
+        // Add the new cluster lists to the cluster queues.
+        topClusterQueue.add(topClusterList);
+        botClusterQueue.add(botClusterList);
+        
+        // Remove the oldest cluster lists from the queues.
+        topClusterQueue.remove();
+        botClusterQueue.remove();
+    }
+}

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSCalorimeterHit.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/HPSCalorimeterHit.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -4,21 +4,11 @@

 
 import java.util.Comparator;
 

-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.IDetectorElementContainer;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.base.BaseCalorimeterHit;

-import org.lcsim.geometry.Detector;

 
 /**
  * An implementation of CalorimeterHit, with a constructor that sets rawEnergy

@@ -29,11 +19,6 @@

  */
 public class HPSCalorimeterHit extends BaseCalorimeterHit {
 

-    Detector detector = null;    
-    //static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null; 
-

     /**
      * Fully qualified constructor that sets rawEnergy
      *

@@ -42,53 +27,9 @@

      * @param time     Time of energy deposition
      * @param id       Cell ID
      * @param type     Type

-     * WARNING: setDetector(detector° must be called after initialization

      */
     public HPSCalorimeterHit(double energy, double time, long id, int type) {
         this.rawEnergy = energy;

-//      if (position != null) {
-//          this.positionVec = new BasicHep3Vector(position);
-//      } else {
-//          positionVec = null;
-//      }
-      this.time = time;
-      this.id = id;
-      this.type = type;
-    }
-    
-    /**
-     * Fully qualified constructor that sets rawEnergy
-     *
-     * @param energy   Raw energy for this cell
-     * @param position Global Cartesian coordinate for this cell
-     * @param time     Time of energy deposition
-     * @param id       Cell ID
-     * @param type     Type
-     * WARNING: setDetector(detector) must be called after initialization
-     */
-    public HPSCalorimeterHit(CalorimeterHit hit) {
-        this.rawEnergy = hit.getRawEnergy();
-//      if (position != null) {
-//          this.positionVec = new BasicHep3Vector(position);
-//      } else {
-//          positionVec = null;
-//      }
-      this.time = hit.getTime();
-      this.id = hit.getCellID();
-      this.type = hit.getType();
-    }
-    
-    /**
-     * Fully qualified constructor that sets rawEnergy
-     *
-     * @param energy   Raw energy for this cell
-     * @param position Global Cartesian coordinate for this cell
-     * @param time     Time of energy deposition
-     * @param id       Cell ID
-     * @param type     Type
-     */
-    public void setParameters(double energy, double time, long id, int type) {
-        this.rawEnergy = energy;

 //        if (position != null) {
 //            this.positionVec = new BasicHep3Vector(position);
 //        } else {

@@ -103,7 +44,7 @@

     public IDetectorElement getDetectorElement() {
         if (de == null) {
 //            findDetectorElementByPosition();

-            IDetectorElementContainer detectorElements = detector.getDetectorElement().findDetectorElement(getIdentifier());

+            IDetectorElementContainer detectorElements = EcalConditions.getSubdetector().getDetectorElement().findDetectorElement(getIdentifier());

             if (detectorElements.size() != 1) {
                 throw new RuntimeException("Expected exactly one DetectorElement matching ID " + getIdentifier() + ", got " + detectorElements.size());
             } else {

@@ -131,26 +72,4 @@

             return Double.compare(o1.getTime(), o2.getTime());
         }
     }

-    
-    /** 
-     * Must be set when an object HPSCalorimeterHit is created.
-     * @param detector (long)
-     */
-    public void setDetector(Detector detector) {
-        this.detector = detector;
-        
-        // ECAL combined conditions object.
-        //ecalConditions = ConditionsManager.defaultInstance()
-        //        .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        //channels = ecalConditions.getChannelCollection();
-        
-        // ID helper.
-        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();
-        
-//        System.out.println("You are now using the database conditions for HPSCalorimeterHit.");
-    }
-    
-    

 }

java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/NeutralPionTriggerDriver.java	                        (rev 0)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-recon/src/main/java/org/hps/recon/ecal/NeutralPionTriggerDriver.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -0,0 +1,1081 @@

+package org.hps.readout.ecal;
+
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import hep.physics.vec.VecOp;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.lcsim.detector.IGeometryInfo;
+import org.lcsim.detector.solids.Trd;
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.EventHeader;
+import org.lcsim.util.aida.AIDA;
+
+/**
+ * Class <code>NeutralPionTriggerDriver</code> simulates a pi-0 trigger.
+ * It executes four cuts, two of which are single cluster cuts and two
+ * of which are cluster pair cuts. The single cluster cuts are on the
+ * total energy of the cluster and the energy of the seed hit of the
+ * cluster. The first cluster pair cut is on the sum of the energies of
+ * both clusters. The second calculates the invariant mass of the
+ * particle that produced the clusters, assuming that clusters were
+ * created by an electron/positron pair. The pair is then cut if the
+ * invariant mass is outside the expected range for a neutral pion decay.
+ * <br/><br/>
+ * All incoming clusters are passed through the single cluster cuts and
+ * those which survive are added to a list of clusters for their event
+ * and stored in a buffer. The buffer stores a number of event lists
+ * equal to coincidence window parameter. This limits the time frame
+ * in which clusters can be used for a trigger. Of the clusters stored
+ * in the cluster buffer, the two with the highest energies are chosen
+ * and the cluster pair cuts are applied to them. If the highest energy
+ * pair survives this process, the event triggers. If it does not,
+ * there is no trigger for the event.
+ * <br/><br/>
+ * All thresholds can be set through a steering file, along with the
+ * coincidence window. The driver also supports a verbose mode where
+ * it will output more details with every event to help with diagnostics.
+ * 
+ * @author Kyle McCarty
+ * @author Michel Garçon
+ */
+public class NeutralPionTriggerDriver extends TriggerDriver {
+	
+	// ==================================================================
+	// ==== Trigger Algorithms ==========================================
+	// ==================================================================	
+	
+    @Override
+    public void endOfData() {
+    	// Print out the results of the trigger cuts.
+    	System.out.printf("Trigger Processing Results%n");
+    	System.out.printf("\tSingle-Cluster Cuts%n");
+    	System.out.printf("\t\tTotal Clusters Processed     :: %d%n", allClusters);
+    	System.out.printf("\t\tPassed Seed Energy Cut       :: %d%n", clusterSeedEnergyCount);
+    	System.out.printf("\t\tPassed Hit Count Cut         :: %d%n", clusterHitCountCount);
+    	if(rejectEdgeCrystals) {
+    		System.out.printf("\t\tPassed Edge Crystal Cut      :: %d%n", clusterEdgeCount);
+    	}
+    	System.out.printf("%n");
+    	System.out.printf("\tCluster Pair Cuts%n");
+    	System.out.printf("\t\tTotal Pairs Processed        :: %d%n", allPairs);
+    	System.out.printf("\t\tPassed Energy Sum Cut        :: %d%n", pairEnergySumCount);
+    	System.out.printf("\t\tPassed Energy Invariant Mass :: %d%n", pairInvariantMassCount);
+    	System.out.printf("%n");
+    	System.out.printf("\tTrigger Count :: %d%n", triggers);
+    	
+    	// Run the superclass method.
+        super.endOfData();
+    }
+	
+	public void process(EventHeader event) {
+		// Generate a temporary list to store the good clusters
+		// in before they are added to the buffer.
+		List<HPSEcalCluster> tempList = new ArrayList<HPSEcalCluster>();
+		
+		// If the current event has a cluster collection, get it.
+		if(event.hasCollection(HPSEcalCluster.class, clusterCollectionName)) {
+			// VERBOSE :: Note that a cluster collection exists for
+			//            this event.
+			if(verbose) { System.out.println("Cluster collection is present for event."); }
+			
+			// Get the cluster list from the event.
+			List<HPSEcalCluster> eventList = event.get(HPSEcalCluster.class, clusterCollectionName);
+			
+			// VERBOSE :: Output the number of extant clusters.
+			if(verbose) { System.out.printf("%d clusters in event.%n", eventList.size()); }
+			
+			// Add the clusters from the event into the cluster list
+			// if they pass the minimum total cluster energy and seed
+			// energy thresholds.
+			for(HPSEcalCluster cluster : eventList) {
+				// Increment the clusters processed count.
+				allClusters++;
+				
+				// Plot the seed energy / cluster energy histogram.
+				seedPercent.fill(cluster.getSeedHit().getCorrectedEnergy() / cluster.getEnergy(), 1);
+				
+				// Get the cluster position indices.
+				int ix = cluster.getSeedHit().getIdentifierFieldValue("ix");
+				int iy = cluster.getSeedHit().getIdentifierFieldValue("iy");
+				
+				// VERBOSE :: Output the current cluster's properties.
+				if(verbose) {
+					System.out.printf("\tTesting cluster at (%d, %d) with total energy %f and seed energy %f.%n",
+							ix, iy, cluster.getSeedHit().getCorrectedEnergy(), cluster.getEnergy());
+				}
+				
+				// Add the clusters to the uncut histograms.
+				clusterHitCount.fill(cluster.getCalorimeterHits().size());
+				clusterTotalEnergy.fill(cluster.getEnergy());
+				clusterSeedEnergy.fill(cluster.getSeedHit().getCorrectedEnergy());
+				clusterDistribution.fill(ix, iy, 1);
+				
+				// VERBOSE :: Output the single cluster trigger thresholds.
+				if(verbose) {
+					System.out.printf("\tCluster seed energy threshold  :: [%f, %f]%n", clusterSeedEnergyThresholdLow, clusterSeedEnergyThresholdHigh);
+					System.out.printf("\tCluster total energy threshold :: %f%n%n", clusterTotalEnergyThresholdLow);
+				}
+				
+				// Perform the single cluster cuts.
+				boolean totalEnergyCut = clusterTotalEnergyCut(cluster);
+				boolean seedEnergyCut = clusterSeedEnergyCut(cluster);
+				boolean hitCountCut = clusterHitCountCut(cluster);
+				boolean edgeCrystalCut = isEdgeCluster(cluster);
+				
+				// Increment the single cut counts.
+				if(seedEnergyCut) {
+					clusterSeedEnergyCount++;
+					if(hitCountCut) {
+						clusterHitCountCount++;
+						if(rejectEdgeCrystals && edgeCrystalCut) {
+							clusterEdgeCount++;
+						}
+					}
+				}
+				
+				// VERBOSE :: Note whether the cluster passed the single
+				//            cluster cuts.
+				if(verbose) {
+					System.out.printf("\tPassed seed energy cut    :: %b%n", seedEnergyCut);
+					System.out.printf("\tPassed cluster energy cut :: %b%n%n", totalEnergyCut);
+					System.out.printf("\tPassed hit count cut :: %b%n%n", hitCountCut);
+					System.out.printf("\tIs an edge cluster :: %b%n%n", edgeCrystalCut);
+				}
+				
+				// Determine whether the cluster passes all the single
+				// cluster cuts.
+				boolean passedCuts = false;
+				
+				// If edge crystals should be not be used for triggering,
+				// require that the cluster not be centered in an edge
+				// crystal.
+				if(rejectEdgeCrystals) {
+					if(totalEnergyCut && seedEnergyCut && hitCountCut && !edgeCrystalCut) {
+						passedCuts = true;
+					}
+				}
+				
+				// Otherwise, it just needs to pass the standard trigger
+				// cuts regardless of where it is located.
+				else {
+					if(totalEnergyCut && seedEnergyCut && hitCountCut) {
+						passedCuts = true;
+					}
+				}
+				
+				// If both pass, add the cluster to the list.
+				if(passedCuts) {
+					// Add the cluster to the cluster list.
+					tempList.add(cluster);
+					
+					// Add the cluster information to the single cut histograms.
+					pClusterHitCount.fill(cluster.getCalorimeterHits().size());
+					pClusterTotalEnergy.fill(cluster.getEnergy());
+					pClusterSeedEnergy.fill(cluster.getSeedHit().getCorrectedEnergy());
+					pClusterDistribution.fill(ix, iy, 1);
+				}
+			}
+			
+			// Remove the oldest cluster buffer element and add the new
+			// cluster list to the buffer.
+			clusterBuffer.removeFirst();
+			clusterBuffer.addLast(tempList);
+		}
+		
+		// Otherwise, clear the cluster list.
+		else {
+			// VERBOSE :: Note that the event has no clusters.
+			if(verbose) { System.out.println("No cluster collection is present for event.\n"); }
+		}
+		
+		// Reset the highest energy pair to null.
+		clusterTriplet[0] = null;
+		clusterTriplet[1] = null;
+		clusterTriplet[2] = null;
+		
+		// Loop over all of the cluster lists in the cluster buffer.
+		double[] energy = { 0.0, 0.0, 0.0 };
+		for(List<HPSEcalCluster> bufferList : clusterBuffer) {
+			// Loop over all of the clusters in each buffer list.
+			for(HPSEcalCluster cluster : bufferList) {
+				// If the new cluster is higher energy than the first
+				// slot cluster, move the subsequent clusters down and
+				// insert the new one.
+				if(cluster.getEnergy() > energy[0]) {
+					clusterTriplet[2] = clusterTriplet[1];
+					clusterTriplet[1] = clusterTriplet[0];
+					clusterTriplet[0] = cluster;
+					energy[2] = energy[1];
+					energy[1] = energy[0];
+					energy[0] = cluster.getEnergy();
+				}
+				
+				// Otherwise, if the new cluster has more energy than
+				// the second slot, it goes there and the second does
+				// to the third.
+				else if(cluster.getEnergy() > energy[1]) {
+					clusterTriplet[2] = clusterTriplet[1];
+					clusterTriplet[1] = cluster;
+					energy[2] = energy[1];
+					energy[1] = cluster.getEnergy();
+				}
+				
+				// If the new cluster has more energy than the third
+				// cluster, it just replaces it.
+				else if(cluster.getEnergy() > energy[2]) {
+					clusterTriplet[2] = cluster;
+					energy[2] = cluster.getEnergy();
+				}
+			}
+		}
+		
+		// The highest energy pair is the same as the first two slots
+		// of the highest energy triplet.
+		clusterPair[0] = clusterTriplet[0];
+		clusterPair[1] = clusterTriplet[1];
+		
+		// Run the superclass event process.
+		super.process(event);
+	}
+	
+	public void startOfData() {
+		// Initialize the cluster buffer to the size of the coincidence window.
+		clusterBuffer = new LinkedList<List<HPSEcalCluster>>();
+		
+		// Populate the buffer with empty lists.
+		for(int i = 0; i < coincidenceWindow; i++) {
+			clusterBuffer.add(new ArrayList<HPSEcalCluster>(0));
+		}
+		
+		// Initialize the cluster hit count diagnostic plots.
+		clusterHitCount = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution", 9, 1, 10);
+		pClusterHitCount = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution (Passed Single Cuts)", 9, 1, 10);
+		aClusterHitCount = aida.histogram1D("Trigger Plots :: Cluster Hit Count Distribution (Passed All Cuts)", 9, 1, 10);
+		
+		// Initialize the cluster total energy diagnostic plots.
+		clusterTotalEnergy = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution", 176, 0.0, 2.2);
+		pClusterTotalEnergy = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution (Passed Single Cuts)", 176, 0.0, 2.2);
+		aClusterTotalEnergy = aida.histogram1D("Trigger Plots :: Cluster Total Energy Distribution (Passed All Cuts)", 176, 0.0, 2.2);
+		
+		// Initialize the cluster seed energy diagnostic plots.
+		clusterSeedEnergy = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution", 176, 0.0, 2.2);
+		pClusterSeedEnergy = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution (Passed Single Cuts)", 176, 0.0, 2.2);
+		aClusterSeedEnergy = aida.histogram1D("Trigger Plots :: Cluster Seed Energy Distribution (Passed All Cuts)", 176, 0.0, 2.2);
+		
+		// Initialize the seed distribution diagnostic plots.
+		clusterDistribution = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution", 44, -22.0, 22.0, 10, -5, 5);
+		pClusterDistribution = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution (Passed Single Cuts)", 44, -23, 23, 11, -5.5, 5.5);
+		aClusterDistribution = aida.histogram2D("Trigger Plots :: Cluster Seed Distribution (Passed All Cuts)", 44, -23, 23, 11, -5.5, 5.5);
+		
+		// Initialize the cluster pair energy sum diagnostic plots.
+		pairEnergySum = aida.histogram1D("Trigger Plots :: Pair Energy Sum Distribution", 176, 0.0, 2.2);
+		pPairEnergySum = aida.histogram1D("Trigger Plots :: Pair Energy Sum Distribution (Passed Pair Cuts)", 176, 0.0, 2.2);
+		
+		// Initialize the cluster pair hypothetical invariant mass diagnostic plots.
+		invariantMass = aida.histogram1D("Trigger Plots :: Invariant Mass Distribution", 1500, 0.0, 0.03);
+		pInvariantMass = aida.histogram1D("Trigger Plots :: Invariant Mass Distribution (Passed Pair Cuts)", 1500, 0.0, 0.03);
+		
+		// Initialize the seed percentage of cluster energy.
+		seedPercent = aida.histogram1D("Analysis Plots :: Seed Percentage of Total Energy", 400, 0.0, 1.0);
+	}
+	
+	protected boolean triggerDecision(EventHeader event) {
+		// If the active cluster pair has a null value, then there were
+		// fewer than two clusters in the buffer and we can not trigger.
+		if(!useClusterTriplet && (clusterPair[0] == null || clusterPair[1] == null)) {
+			// VERBOSE :: Note that triggering failed due to insufficient
+			// clusters. in the cluster buffer.
+			if(verbose) { System.out.println("Inufficient clusters in buffer -- no trigger."); }
+			
+			// Return false; we can not trigger without two clusters.
+			return false;
+		}
+		
+		// If the active cluster triplet has a null value, then there
+		// were fewer than three clusters in the buffer and we can not
+		// trigger.
+		if(useClusterTriplet && (clusterTriplet[0] == null || clusterTriplet[1] == null || clusterTriplet[2] == null)) {
+			// VERBOSE :: Note that triggering failed due to insufficient
+			// clusters. in the cluster buffer.
+			if(verbose) { System.out.println("Inufficient clusters in buffer -- no trigger."); }
+			
+			// Return false; we can not trigger without three clusters.
+			return false;
+		}
+		
+		// Increment the number of pairs considered.
+		allPairs++;
+		
+		// Get the cluster position indices.
+		int[] ix = { clusterPair[0].getSeedHit().getIdentifierFieldValue("ix"), clusterPair[1].getSeedHit().getIdentifierFieldValue("ix") };
+		int[] iy = { clusterPair[0].getSeedHit().getIdentifierFieldValue("iy"), clusterPair[1].getSeedHit().getIdentifierFieldValue("iy") };
+		
+		// VERBOSE :: Output the clusters selected for triggering.
+		if(verbose) {
+			System.out.printf("\tTesting first cluster at (%d, %d) with total energy %f and seed energy %f.%n",
+					ix[0], iy[0], clusterPair[0].getSeedHit().getCorrectedEnergy(), clusterPair[0].getEnergy());
+			System.out.printf("\tTesting second cluster at (%d, %d) with total energy %f and seed energy %f.%n",
+					ix[1], iy[1], clusterPair[1].getSeedHit().getCorrectedEnergy(), clusterPair[1].getEnergy());
+			if(useClusterTriplet) {
+				System.out.printf("\tTesting third cluster at (%d, %d) with total energy %f and seed energy %f.%n",
+						ix[1], iy[1], clusterTriplet[2].getSeedHit().getCorrectedEnergy(), clusterTriplet[2].getEnergy());
+			}
+		}
+		
+		if(!useClusterTriplet) {
+			// Fill the uncut histograms.
+			pairEnergySum.fill(getEnergySumValue(clusterPair));
+			invariantMass.fill(getInvariantMassValue(clusterPair));
+			
+			// VERBOSE :: Output the cluster pair trigger thresholds.
+			if(verbose) {
+				System.out.printf("\tCluster pair energy sum threshold     :: %f%n", pairEnergySumThresholdLow);
+				System.out.printf("\tHypothetical invariant mass threshold :: [%f, %f]%n%n", invariantMassThresholdLow, invariantMassThresholdHigh);
+			}
+			
+			// Perform the cluster pair checks.
+			boolean energySumCut = pairEnergySumCut(clusterPair);
+			boolean invariantMassCut = pairInvariantMassCut(clusterPair);
+			
+			// Increment the pair cut counts.
+			if(energySumCut) {
+				pairEnergySumCount++;
+				if(invariantMassCut) {
+					pairInvariantMassCount++;
+				}
+			}
+			
+			// VERBOSE :: Note the outcome of the trigger cuts.
+			if(verbose) {
+				System.out.printf("\tPassed energy sum cut     :: %b%n", energySumCut);
+				System.out.printf("\tPassed invariant mass cut :: %b%n%n", invariantMassCut);
+			}
+			
+			// If the pair passes both cuts, we have a trigger.
+			if(energySumCut && invariantMassCut) {
+				// Fill the cut histograms.
+				pPairEnergySum.fill(getEnergySumValue(clusterPair));
+				pInvariantMass.fill(getInvariantMassValue(clusterPair));
+				
+				// Fill the all cuts histograms.
+				aClusterHitCount.fill(clusterPair[0].getCalorimeterHits().size());
+				aClusterHitCount.fill(clusterPair[1].getCalorimeterHits().size());
+				aClusterTotalEnergy.fill(clusterPair[0].getEnergy());
+				aClusterTotalEnergy.fill(clusterPair[1].getEnergy());
+				aClusterSeedEnergy.fill(clusterPair[0].getSeedHit().getCorrectedEnergy());
+				aClusterSeedEnergy.fill(clusterPair[1].getSeedHit().getCorrectedEnergy());
+				aClusterDistribution.fill(ix[0], iy[0], 1);
+				aClusterDistribution.fill(ix[1], iy[1], 1);
+				
+				// VERBOSE :: Note that the event has triggered.
+				if(verbose) { System.out.println("Event triggers!\n\n"); }
+				
+				// Increment the number of triggers.
+				triggers++;
+				
+				// Return the trigger.
+				return true;
+			}
+		}
+		
+		// If we are using a cluster triplet, apply the cluster triplet
+		// cuts.
+		else {
+			// Perform the cluster triplet checks.
+			boolean energySumCut = tripletEnergySumCut(clusterTriplet);
+			boolean horizontalCut = tripletHorizontalCut(clusterTriplet);
+			boolean energySpatialCut = tripletTotalEnergyCut(clusterTriplet);
+			
+			// Fill the all cuts histograms.
+			aClusterHitCount.fill(clusterPair[0].getCalorimeterHits().size());
+			aClusterHitCount.fill(clusterPair[1].getCalorimeterHits().size());
+			aClusterTotalEnergy.fill(clusterPair[0].getEnergy());
+			aClusterTotalEnergy.fill(clusterPair[1].getEnergy());
+			aClusterSeedEnergy.fill(clusterPair[0].getSeedHit().getCorrectedEnergy());
+			aClusterSeedEnergy.fill(clusterPair[1].getSeedHit().getCorrectedEnergy());
+			aClusterDistribution.fill(ix[0], iy[0], 1);
+			aClusterDistribution.fill(ix[1], iy[1], 1);
+			
+			if(energySumCut && horizontalCut && energySpatialCut) {
+				return true;
+			}
+		}
+		
+		// VERBOSE :: Note that the event has failed to trigger.
+		if(verbose) { System.out.println("No trigger.\n\n"); }
+		
+		// If one or more of the pair cuts failed, the we do not trigger.
+		return false;
+	}
+	
+	// ==================================================================
+	// ==== Trigger Cut Methods =========================================
+	// ==================================================================
+	
+	/**
+	 * Checks whether the cluster passes the threshold for minimum
+	 * number of component hits.
+	 * @param cluster - The cluster to check.
+	 * @return Returns <code>true</code> if the cluster passes and <code>
+	 * false</code> if it does not.
+	 */
+	private boolean clusterHitCountCut(HPSEcalCluster cluster) {
+		return cluster.getCalorimeterHits().size() >= clusterHitCountThreshold;
+	}
+	
+	/**
+	 * Checks whether the cluster falls within the allowed range for
+	 * the seed hit energy cut.
+	 * @param cluster - The cluster to check.
+	 * @return Returns <code>true</code> if the cluster passes and <code>
+	 * false</code> if it does not.
+	 */
+	private boolean clusterSeedEnergyCut(HPSEcalCluster cluster) {
+		// Get the seed energy value.
+		double seedEnergy = cluster.getSeedHit().getCorrectedEnergy();
+		
+		// Perform the seed energy cut.
+		return seedEnergy >= clusterSeedEnergyThresholdLow && seedEnergy <= clusterSeedEnergyThresholdHigh;
+	}
+	
+	/**
+	 * Checks whether the cluster passes the threshold for minimum
+	 * total cluster energy.
+	 * @param cluster - The cluster to check.
+	 * @return Returns <code>true</code> if the cluster passes and <code>
+	 * false</code> if it does not.
+	 */
+	private boolean clusterTotalEnergyCut(HPSEcalCluster cluster) {
+		// Get the cluster energy.
+		double clusterEnergy = cluster.getEnergy();
+		
+		// Perform the cut.
+		return clusterEnergy >= clusterTotalEnergyThresholdLow && clusterEnergy <= clusterTotalEnergyThresholdHigh;
+	}
+	
+	/**
+	 * Calculates the value used in the pair energy sum cut from a pair
+	 * of two clusters.
+	 * @param clusterPair - The cluster pair from which to derive the
+	 * cut value.
+	 * @return Returns the cut value as a <code>double</code>.
+	 */
+	private static double getEnergySumValue(HPSEcalCluster[] clusterGroup) {
+		// Track the sum.
+		double energySum = 0.0;
+		
+		// Add the energies of all clusters in the array.
+		for(HPSEcalCluster cluster : clusterGroup) { energySum += cluster.getEnergy(); }
+		
+		// Return the sum.
+		return energySum;
+	}
+	
+	/**
+	 * Calculates the value used in the invariant mass cut from a pair
+	 * of two clusters.
+	 * @param clusterPair - The cluster pair from which to derive the
+	 * cut value.
+	 * @return Returns the cut value as a <code>double</code>.
+	 */
+	private double getInvariantMassValue(HPSEcalCluster[] clusterPair) {
+		// Store the x/y positions for the seeds.
+		double x[] = new double[2];
+		double y[] = new double[2];
+		
+		// Get the seed hits.
+		CalorimeterHit[] seed = { clusterPair[0].getSeedHit(), clusterPair[1].getSeedHit() };
+		
+		// Set the positions for each seed.
+		for(int index = 0; index < seed.length; index++) {
+			// Get the seed position array stored in the position map.
+			Double[] seedPos = seedPosMap.get(clusterPair[index].getSeedHit());
+			
+			// If there is a position array for the seed, use it.
+			if(seedPos != null) {
+				x[index] = seedPos[0];
+				y[index] = seedPos[1];
+			}
+			
+			// Otherwise, calculate the position at the crystal face.
+			else {
+				// Get the position and store it in a double array.
+				IGeometryInfo geom = clusterPair[index].getSeedHit().getDetectorElement().getGeometry();
+				double[] pos = geom.transformLocalToGlobal(VecOp.add(geom.transformGlobalToLocal(geom.getPosition()),
+						(Hep3Vector) new BasicHep3Vector(0, 0, -1 * ((Trd) geom.getLogicalVolume().getSolid()).getZHalfLength()))).v();
+				
+				// Set the seed location.
+				x[index] = pos[0];
+				y[index] = pos[1];
+				
+				// Store the seed location for future use.
+				Double[] positionVec = { pos[0], pos[1], pos[2] };
+				seedPosMap.put(clusterPair[index].getSeedHit(), positionVec);
+			}
+		}
+		
+		// Get the cluster energy for each seed.
+		double[] e = { clusterPair[0].getEnergy(), clusterPair[1].getEnergy() };
+		
+		//Return the invariant mass.
+		return (e[0] * e[1] * (Math.pow(x[0] - x[1], 2) + Math.pow(y[0] - y[1], 2)) / D2);
+	}
+	
+	/**
+	 * Indicates whether a cluster has a seed hit located on the edge
+	 * of the calorimeter or not.
+	 * 
+	 * @param cluster - The cluster to check.
+	 * @return Returns <code>true</code> if the cluster seed is on the
+	 * edge of the calorimeter and <code>false</code> otherwise.
+	 */
+	private static boolean isEdgeCluster(HPSEcalCluster cluster) {
+		// Get the x- and y-indices of the cluster seed hit.
+		int ix = cluster.getSeedHit().getIdentifierFieldValue("ix");
+		int iy = cluster.getSeedHit().getIdentifierFieldValue("iy");
+		
+		// Track whether the cluster is an edge cluster or not.
+    	boolean edge = false;
+    	
+    	// Get the absolute values of the coordinates.
+    	int aix = Math.abs(ix);
+    	int aiy = Math.abs(iy);
+    	
+    	// Check if this an outer edge crystal.
+    	if(aix == 23 || aiy == 5) { edge = true; }
+    	
+    	// Check if this along the central beam gap.
+    	if(aiy == 1) { edge = true; }
+    	
+    	// Check if this is around the beam gap.
+    	if(aiy == 2 && (ix >= -11 && ix <= -1)) { edge = true; }
+    	
+    	// Otherwise, this is not an edge crystal.
+    	return edge;
+	}
+	
+	/**
+	 * Checks whether the cluster pair passes the falls within the
+	 * allowed range for the piar energy sum cut.
+	 * @param clusterPair - An array of size two containing the cluster
+	 * pair to check.
+	 * @return Returns <code>true</code> if the clusters pass and <code>
+	 * false</code> if they does not.
+	 */
+	private boolean pairEnergySumCut(HPSEcalCluster[] clusterPair) {
+		// Get the energy sum value.
+		double energySum = getEnergySumValue(clusterPair);
+		
+		// Otherwise, get the energy sum and compare it to the threshold.
+		return energySum >= pairEnergySumThresholdLow && energySum <= pairEnergySumThresholdHigh;
+	}
+	
+	/**
+	 * Checks whether the cluster pair passes the threshold for the
+	 * invariant mass check.
+	 * @param clusterPair - An array of size two containing the cluster
+	 * pair to check.
+	 * @return Returns <code>true</code> if the clusters pass and <code>
+	 * false</code> if they does not.
+	 */
+	private boolean pairInvariantMassCut(HPSEcalCluster[] clusterPair) {
+		// Calculate the invariant mass.
+		double myy2 = getInvariantMassValue(clusterPair);
+		
+		// Perform the cut.
+		return ( (myy2 >= invariantMassThresholdLow) && (myy2 <= invariantMassThresholdHigh));
+	}
+	
+	/**
+	 * Checks whether the cluster pair passes the threshold for the
+	 * minimum pair energy sum check.
+	 * @param clusterTriplet - An array of size three containing the
+	 * cluster triplet to check.
+	 * @return Returns <code>true</code> if the clusters pass and <code>
+	 * false</code> if they does not.
+	 */
+	private boolean tripletEnergySumCut(HPSEcalCluster[] clusterTriplet) {
+		return (getEnergySumValue(clusterTriplet) >= tripletEnergySumThreshold);
+	}
+	
+	/**
+	 * Checks that there is at least one cluster is located on the right
+	 * side and at least one cluster on the left side of the calorimeter.
+	 * @param clusterTriplet - An array of size three containing the
+	 * cluster triplet to check.
+	 * @return Returns <code>true</code> if the clusters pass and <code>
+	 * false</code> if they does not.
+	 */
+	private static boolean tripletHorizontalCut(HPSEcalCluster[] clusterTriplet) {
+		// Track whether a cluster has occurred on each horizontal side
+		// of the calorimeter.
+		boolean leftCluster = false;
+		boolean rightCluster = false;
+		
+		// Sort through the cluster triplet and check where they occur.
+		for(HPSEcalCluster cluster : clusterTriplet) {
+			int ix = cluster.getSeedHit().getIdentifierFieldValue("ix");
+			if(ix < 0) { leftCluster = true; }
+			if(ix > 0) { rightCluster = true; }
+		}
+		
+		// If a cluster fell on both sides, it passes.
+		if(leftCluster && rightCluster) { return true; }
+		else { return false; }
+	}
+	
+	private boolean tripletTotalEnergyCut(HPSEcalCluster[] clusterTriplet) {
+		// Check to see if each cluster passes the check.
+		for(HPSEcalCluster cluster1 : clusterTriplet) {
+			for(HPSEcalCluster cluster2 : clusterTriplet) {
+				// The cluster pair must be two different clusters.
+				if(cluster1 == cluster2) { continue; }
+				
+				// Check to see if the clusters are over threshold.
+				boolean over1 = cluster1.getEnergy() >= tripletTotalEnergyThreshold;
+				boolean over2 = cluster1.getEnergy() >= tripletTotalEnergyThreshold;
+				
+				// If both the clusters are over threshold, check that
+				// they are sufficiently far apart.
+				if(over1 && over2) {
+					// Get the x and y coordinates of the clusters.
+					double x[] = { cluster1.getPosition()[0], cluster2.getPosition()[0] };
+					double y[] = { cluster1.getPosition()[1], cluster2.getPosition()[1] };
+					
+					// Calculate the distance between the clusters.
+					double dr = Math.sqrt(x[0] * x[0] + y[0] * y[0]);
+					
+					// Run the check.
+					if(dr >= tripletPairSeparationThreshold) { return true; }
+				}
+			}
+		}
+		
+		// If none of the cluster pairs pass all the checks, the
+		// triplet fails.
+		return false;
+	}
+	
+	// ==================================================================
+	// ==== Variables Mutator Methods ===================================
+	// ==================================================================
+	
+	/**
+	 * Sets the LCIO collection name where <code>HPSEcalCluster</code>
+	 * objects are stored for use in the trigger.
+	 * @param clusterCollectionName - The name of the LCIO collection.
+	 */
+	public void setClusterCollectionName(String clusterCollectionName) {
+		this.clusterCollectionName = clusterCollectionName;
+	}
+	
+	/**
+	 * Sets the minimum number of hits required for a cluster to be
+	 * used in triggering.
+	 * @param clusterHitCountThreshold - The smallest number of hits
+	 * in a cluster.
+	 */
+	public void setClusterHitCountThreshold(int clusterHitCountThreshold) {
+		this.clusterHitCountThreshold = clusterHitCountThreshold;
+	}
+	
+	/**
+	 * Sets the threshold for the cluster seed energy of individual
+	 * clusters above which the cluster will be rejected and not used
+	 * for triggering.
+	 * @param clusterSeedEnergyThresholdHigh - The cluster seed energy
+	 * lower bound.
+	 */
+	public void setClusterSeedEnergyThresholdHigh(double clusterSeedEnergyThresholdHigh) {
+		this.clusterSeedEnergyThresholdHigh = clusterSeedEnergyThresholdHigh;
+	}
+	
+	/**
+	 * Sets the threshold for the cluster seed energy of individual
+	 * clusters under which the cluster will be rejected and not used
+	 * for triggering.
+	 * @param clusterSeedEnergyThresholdLow - The cluster seed energy
+	 * lower bound.
+	 */
+	public void setClusterSeedEnergyThresholdLow(double clusterSeedEnergyThresholdLow) {
+		this.clusterSeedEnergyThresholdLow = clusterSeedEnergyThresholdLow;
+	}
+	
+	/**
+	 * Sets the threshold for the total cluster energy of individual
+	 * clusters under which the cluster will be rejected and not used
+	 * for triggering.
+	 * @param clusterTotalEnergyThresholdLow - The cluster total energy
+	 * lower bound.
+	 */
+	public void setClusterTotalEnergyThresholdLow(double clusterTotalEnergyThresholdLow) {
+		this.clusterTotalEnergyThresholdLow = clusterTotalEnergyThresholdLow;
+	}
+	
+	/**
+	 * Sets the threshold for the total cluster energy of individual
+	 * clusters above which the cluster will be rejected and not used
+	 * for triggering.
+	 * @param clusterTotalEnergyThresholdHigh - The cluster total energy
+	 * upper bound.
+	 */
+	public void setClusterTotalEnergyThresholdHigh(double clusterTotalEnergyThresholdHigh) {
+		this.clusterTotalEnergyThresholdHigh = clusterTotalEnergyThresholdHigh;
+	}
+	
+	/**
+	 * Sets the number of events that clusters will be retained and
+	 * employed for triggering before they are cleared.
+	 * @param coincidenceWindow - The number of events that clusters
+	 * should be retained.
+	 */
+	public void setCoincidenceWindow(int coincidenceWindow) {
+		this.coincidenceWindow = coincidenceWindow;
+	}
+	
+	/**
+	 * Sets the invariant mass threshold to accept only cluster pairs
+	 * with a reconstructed invariant mass within a certain number of
+	 * standard deviations of the mean (corrected for sampling fraction).
+	 * @param invariantMassSigma - The number of standard deviations
+	 * within which a cluster pair invariant mass is accepted.
+	 */
+	public void setInvariantMassSigma(int invariantMassSigma) {
+		this.invariantMassThresholdLow = 0.012499 - (invariantMassSigma * 0.0011095);
+		this.invariantMassThresholdHigh = 0.012499 + (invariantMassSigma * 0.0011095);
+	}
+	
+	/**
+	 * Sets the threshold for the calculated invariant mass of the
+	 * generating particle (assuming that the clusters are produced
+	 * by a positron/electron pair) above which the cluster pair will
+	 * be rejected and not produce a trigger.
+	 * @param invariantMassThresholdHigh - The invariant mass upper
+	 * bound.
+	 */
+	public void setInvariantMassThresholdHigh(double invariantMassThresholdHigh) {
+		this.invariantMassThresholdHigh = invariantMassThresholdHigh;
+	}
+	
+	/**
+	 * Sets the threshold for the calculated invariant mass of the
+	 * generating particle (assuming that the clusters are produced
+	 * by a positron/electron pair) under which the cluster pair will
+	 * be rejected and not produce a trigger.
+	 * @param invariantMassThresholdLow - The invariant mass lower
+	 * bound.
+	 */
+	public void setInvariantMassThresholdLow(double invariantMassThresholdLow) {
+		this.invariantMassThresholdLow = invariantMassThresholdLow;
+	}
+	
+	/**
+	 * Sets the threshold for the sum of the energies of a cluster pair
+	 * above which the pair will be rejected and not produce a trigger.
+	 * @param pairEnergySumThresholdHigh - The cluster pair energy sum
+	 * upper bound.
+	 */
+	public void setPairEnergySumThresholdHigh(double pairEnergySumThresholdHigh) {
+		this.pairEnergySumThresholdHigh = pairEnergySumThresholdHigh;
+	}
+	
+	/**
+	 * Sets the threshold for the sum of the energies of a cluster pair
+	 * under which the pair will be rejected and not produce a trigger.
+	 * @param pairEnergySumThresholdLow - The cluster pair energy sum
+	 * lower bound.
+	 */
+	public void setPairEnergySumThresholdLow(double pairEnergySumThresholdLow) {
+		this.pairEnergySumThresholdLow = pairEnergySumThresholdLow;
+	}
+	
+	/**
+	 * Sets whether clusters centered on an edge crystal should be
+	 * used for triggering or not.
+	 * 
+	 * @param rejectEdgeCrystals - <code>true</code> means that edge
+	 * clusters will not be used and <code>false</code> means that they
+	 * will be used.
+	 */
+	public void setRejectEdgeCrystals(boolean rejectEdgeCrystals) {
+		this.rejectEdgeCrystals = rejectEdgeCrystals;
+	}
+	
+	/**
+	 * Sets the threshold for the sum of the energies of a cluster triplet
+	 * under which the triplet will be rejected and not produce a trigger.
+	 * @param tripletEnergySumThreshold - The cluster triplet energy sum
+	 * lower bound.
+	 */
+	public void setTripletEnergySumThreshold(double tripletEnergySumThreshold) {
+		this.tripletEnergySumThreshold = tripletEnergySumThreshold;
+	}
+	
+	/**
+	 * Sets the minimum distance apart for a cluster pair within a
+	 * cluster triplet. Clusters that are not sufficiently far apart
+	 * are rejected and do not trigger. 
+	 * @param tripletPairSeparationThreshold - The minimum distance in
+	 * millimeters.
+	 */
+	public void setTripletPairSeparationThreshold(double tripletPairSeparationThreshold) {
+		this.tripletPairSeparationThreshold = tripletPairSeparationThreshold;
+	}
+	
+	/**
+	 * Sets the threshold for which at least two clusters in a cluster
+	 * triplet will be required to surpass. Cluster triplets with one
+	 * or fewer clusters above the threshold will be rejected.
+	 * @param tripletTotalEnergyThreshold - The cluster total energy
+	 * that two clusters must pass.
+	 */
+	public void setTripletTotalEnergyThreshold(double tripletTotalEnergyThreshold) {
+		this.tripletTotalEnergyThreshold = tripletTotalEnergyThreshold;
+	}
+	
+	/**
+	 * Toggles whether the driver will output its actions to the console
+	 * during run time or not.
+	 * @param verbose - <code>true</code> indicates that the console
+	 * will write its actions and <code>false</code> that it will not.
+	 */
+	public void setVerbose(boolean verbose) {
+		this.verbose = verbose;
+	}
+	
+	/**
+	 * Toggles whether the driver triggers off of a pair of clusters
+	 * or a triplet of clusters.
+	 * @param useClusterTriplet - <code>true</code> indicates that a
+	 * triplet should be used and <code>false</code> that a pair should
+	 * be used.
+	 */
+	public void setUseClusterTriplet(boolean useClusterTriplet) {
+		this.useClusterTriplet = useClusterTriplet;
+	}
+	
+	// ==================================================================
+	// ==== AIDA Plots ==================================================
+	// ==================================================================
+	IHistogram2D aClusterDistribution;
+	IHistogram1D aClusterHitCount;
+	IHistogram1D aClusterSeedEnergy;
+	IHistogram1D aClusterTotalEnergy;
+	IHistogram2D clusterDistribution;
+	IHistogram1D clusterHitCount;
+	IHistogram1D clusterSeedEnergy;
+	IHistogram1D clusterTotalEnergy;
+	IHistogram1D invariantMass;
+	IHistogram1D pairEnergySum;
+	IHistogram1D pClusterHitCount;
+	IHistogram2D pClusterDistribution;
+	IHistogram1D pClusterSeedEnergy;
+	IHistogram1D pClusterTotalEnergy;
+	IHistogram1D pPairEnergySum;
+	IHistogram1D pInvariantMass;
+	IHistogram1D seedPercent;
+	
+	// ==================================================================
+	// ==== Variables ===================================================
+	// ==================================================================
+	
+	/**
+	 * <b>aida</b><br/><br/>
+	 * <code>private AIDA <b>aida</b></code><br/><br/>
+	 * Factory for generating histograms.
+	 */
+	private AIDA aida = AIDA.defaultInstance();
+	
+	/**
+	 * <b>clusterBuffer</b><br/><br/>
+	 * <code>private LinkedList<List<HPSEcalCluster>> <b>clusterBuffer</b></code><br/><br/>
+	 * Stores the list of clusters from each event for a finite-sized
+	 * buffer. The size of the buffer is determined by the coincidence
+	 * window.
+	 */
+	private LinkedList<List<HPSEcalCluster>> clusterBuffer;
+	
+	/**
+	 * <b>clusterCollectionName</b><br/><br/>
+	 * <code>private String <b>clusterCollectionName</b></code><br/><br/>
+	 * The name of the LCIO collection containing <code>HPSEcalCluster
+	 * </code> objects.
+	 */
+	private String clusterCollectionName = "EcalClusters";
+	
+	/**
+	 * <b>clusterPair</b><br/><br/>
+	 * <code>private HPSEcalCluster[] <b>clusterPair</b></code><br/><br/>
+	 * Stores the two highest energy clusters located in the cluster
+	 * buffer. These are sorted by energy, with the highest energy
+	 * cluster first in the array.
+	 */
+	private HPSEcalCluster[] clusterPair = new HPSEcalCluster[2];
+	
+	/**
+	 * <b>clusterHitCountThreshold</b><br/><br/>
+	 * <code>private int <b>clusterHitCountThreshold</b></code><br/><br/>
+	 * Defines the minimum number of hits required for a cluster to
+	 * be used in triggering.
+	 */
+	private int clusterHitCountThreshold = 5;
+	
+	/**
+	 * <b>clusterSeedEnergyThresholdLow</b><br/><br/>
+	 * <code>private double <b>clusterSeedEnergyThresholdLow</b></code><br/><br/>
+	 * Defines the threshold for the cluster seed energy under which
+	 * a cluster will be rejected.
+	 */
+	private double clusterSeedEnergyThresholdLow = 0.15;
+	
+	/**
+	 * <b>clusterSeedEnergyThresholdHigh</b><br/><br/>
+	 * <code>private double <b>clusterSeedEnergyThresholdHigh</b></code><br/><br/>
+	 * Defines the threshold for the cluster seed energy above which
+	 * a cluster will be rejected.
+	 */
+	private double clusterSeedEnergyThresholdHigh = 1.00;
+	
+	/**
+	 * <b>clusterTotalEnergyThresholdLow</b><br/><br/>
+	 * <code>private double <b>clusterTotalEnergyThreshold</b></code><br/><br/>
+	 * Defines the threshold for the total cluster energy under which
+	 * a cluster will be rejected.
+	 */
+	private double clusterTotalEnergyThresholdLow = 0.0;
+	
+	/**
+	 * <b>clusterTotalEnergyThresholdHigh</b><br/><br/>
+	 * <code>private double <b>clusterTotalEnergyThresholdHigh</b></code><br/><br/>
+	 * Defines the threshold for the total cluster energy above which
+	 * a cluster will be rejected.
+	 */
+	private double clusterTotalEnergyThresholdHigh = Double.MAX_VALUE;
+	
+	/**
+	 * <b>clusterTriplet</b><br/><br/>
+	 * <code>private HPSEcalCluster[] <b>clusterTriplet</b></code><br/><br/>
+	 * Stores the three highest energy clusters located in the cluster
+	 * buffer. These are sorted by energy, with the highest energy
+	 * cluster first in the array.
+	 */
+	private HPSEcalCluster[] clusterTriplet = new HPSEcalCluster[3]; 
+	
+	/**
+	 * <b>coincidenceWindow</b><br/><br/>
+	 * <code>private int <b>coincidenceWindow</b></code><br/><br/>
+	 * The number of events for which clusters will be retained and
+	 * used in the trigger before they are removed.
+	 */
+	private int coincidenceWindow = 3;
+	
+	/**
+	 * <b>D2</b><br/><br/>
+	 * <code>private static final double <b>D2</b></code><br/><br/>
+	 * The squared distance of the calorimeter from the target.
+	 */
+	private static final double D2 = 1414 * 1414; // (1414^2 mm^2)
+	
+	/**
+	 * <b>invariantMassThresholdHigh</b><br/><br/>
+	 * <code>private double <b>invariantMassThresholdHigh</b></code><br/><br/>
+	 * Defines the threshold for the invariant mass of the generating
+	 * particle above which the cluster pair will be rejected.
+	 */
+	private double invariantMassThresholdHigh = 0.01472;
+	
+	/**
+	 * <b>invariantMassThresholdLow</b><br/><br/>

[truncated at 1000 lines; 84 more skipped]

java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/ECalEvioReader.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/ECalEvioReader.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -3,32 +3,18 @@

 import java.util.ArrayList;
 import java.util.List;
 

-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ConditionsDriver;
-import org.hps.conditions.DatabaseConditionsManager;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannel;
-import org.hps.conditions.ecal.EcalChannel.DaqId;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;
-//import org.hps.conditions.deprecated.EcalConditions;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.jlab.coda.jevio.BaseStructure;
 import org.jlab.coda.jevio.BaseStructureHeader;
 import org.jlab.coda.jevio.CompositeData;
 import org.jlab.coda.jevio.EvioEvent;
 import org.jlab.coda.jevio.EvioException;

+import org.lcsim.detector.identifier.Identifier;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.SimTrackerHit;
 import org.lcsim.event.base.BaseRawCalorimeterHit;
 import org.lcsim.event.base.BaseRawTrackerHit;

-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.Subdetector;

 import org.lcsim.lcio.LCIOConstants;
 
 /**

@@ -41,35 +27,9 @@

 
     private int bankTag = EventConstants.ECAL_PULSE_INTEGRAL_BANK_TAG;
     private Class hitClass = BaseRawCalorimeterHit.class;

-    
-    // FIXME: Hard-coded detector names.
-    private static String readoutName = "EcalHits";
-    private static String subdetectorName = "Ecal";
-    Detector detector;
-    Subdetector subDetector;
-    
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null; 

 
     public ECalEvioReader() {
         hitCollectionName = "EcalReadoutHits";

-        
-        detector = DatabaseConditionsManager.getInstance().getDetectorObject();
-        subDetector = detector.getSubdetector(subdetectorName);
-        
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        helper = subDetector.getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for ECalEvioReader.java");
-        // ID helper.
-//        helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();

     }
 
     @Override

@@ -131,7 +91,7 @@

                 }
             }
         }

-//        String readoutName = ;

+        String readoutName = EcalConditions.getSubdetector().getReadout().getName();

         lcsimEvent.put(hitCollectionName, hits, hitClass, flags, readoutName);
 //        for (Object hit : hits) {
 //            System.out.println(((RawTrackerHit) hit).getIDDecoder().getIDDescription().toString());

@@ -166,44 +126,22 @@

                 if (debug) {
                     System.out.println("  channel=" + channel + "; nSamples=" + nSamples);
                 }

+                Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);

-                
-                 long id = daqToGeometryId(crate, slot, channel);
-//                Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);
-
-                 System.out.println("The long id is: " + id);
-                 

                 short[] adcValues = new short[nSamples];
                 for (int i = 0; i < nSamples; i++) {
                     adcValues[i] = cdata.getShort();
                 }

-//                if (id == null) {
-//                    System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
-//                } else {
-                    hits.add(new BaseRawTrackerHit(
-                    		0, 
-                    		id, 
-                    		adcValues, 
-                    		new ArrayList<SimTrackerHit>(), 
-                    		subDetector
-                    		    .getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
-//                }

+                if (id == null) {
+                    System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
+                } else {
+                    hits.add(new BaseRawTrackerHit(0, id, adcValues, new ArrayList<SimTrackerHit>(), EcalConditions.getSubdetector().getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));
+                }

             }
         }
         return hits;
     }
 

-	private long daqToGeometryId(int crate, short slot, short channel) {
-		DaqId daqId = new DaqId(new int[]{crate,slot,channel});
-		 EcalChannel ecalChannel = channels.findChannel(daqId);
-		 if(ecalChannel == null) throw new RuntimeException("Daq Id not found.");
-		 int ix = ecalChannel.getX();
-		 int iy = ecalChannel.getY();
-		 GeometryId geometryId = new GeometryId(helper, new int[]{subDetector.getSystemID(),ix,iy});
-		 long id = geometryId.encode();
-		return id;
-	}
-

     private List<BaseRawTrackerHit> makePulseHits(CompositeData cdata, int crate) {
         List<BaseRawTrackerHit> hits = new ArrayList<BaseRawTrackerHit>();
         if (debug) {

@@ -230,7 +168,7 @@

                 if (debug) {
                     System.out.println("  channel=" + channel + "; npulses=" + npulses);
                 }

-                Long id = daqToGeometryId(crate, slot, channel);

+                Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);

                 for (int k = 0; k < npulses; k++) {
                     short pulseNum = cdata.getByte();
                     int sampleCount = cdata.getNValue();

@@ -241,7 +179,7 @@

                     if (id == null) {
                         System.out.printf("Crate %d, slot %d, channel %d not found in map\n", crate, slot, channel);
                     } else {

-                        hits.add(new BaseRawTrackerHit(pulseNum, id, adcValues, new ArrayList<SimTrackerHit>(), subDetector.getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));

+                        hits.add(new BaseRawTrackerHit(pulseNum, id, adcValues, new ArrayList<SimTrackerHit>(), EcalConditions.getSubdetector().getDetectorElement().findDetectorElement(new Identifier(id)).get(0)));

                     }
                 }
             }

@@ -275,7 +213,7 @@

                 if (debug) {
                     System.out.println("  channel=" + channel + "; npulses=" + npulses);
                 }

-                Long id = daqToGeometryId(crate, slot, channel);

+                Long id = EcalConditions.daqToPhysicalID(crate, slot, channel);

 
                 for (int k = 0; k < npulses; k++) {
                     short pulseTime = cdata.getShort();

java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/ECalHitWriter.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/ECalHitWriter.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -5,30 +5,17 @@

 import java.util.List;
 import java.util.Map;
 

-import org.hps.conditions.DatabaseConditionsManager;
-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalConditionsUtil;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.hps.conditions.ecal.EcalChannel.GeometryId;
-//import org.hps.conditions.deprecated.EcalConditions;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.jlab.coda.jevio.BaseStructure;
 import org.jlab.coda.jevio.CompositeData;
 import org.jlab.coda.jevio.DataType;
 import org.jlab.coda.jevio.EventBuilder;
 import org.jlab.coda.jevio.EvioBank;
 import org.jlab.coda.jevio.EvioException;

-import org.lcsim.conditions.ConditionsManager;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.Identifier;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.event.RawTrackerHit;

-import org.lcsim.geometry.Detector;

 import org.lcsim.geometry.IDDecoder;

-import org.lcsim.geometry.Subdetector;

 import org.lcsim.lcio.LCIOConstants;
 
 import static org.hps.evio.EventConstants.*;

@@ -43,38 +30,8 @@

     private String hitCollectionName = "EcalReadoutHits";
     private int mode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
 

-    // FIXME: Hard-coded detector names.
-    private static String subdetectorName = "Ecal";
-    Detector detector = null;
-    public Subdetector subDetector;
-    
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null;     
-    
-    public ECalHitWriter() { 	

+    public ECalHitWriter() {

     }

-    
-    /** 
-     * Must be set when an object EcalHitWriter is created.
-     * @param detector (long)
-     */   
-    void setDetector(Detector detector) {
-    	
-        this.detector = detector;
-        subDetector = detector.getSubdetector(subdetectorName);
-        
-        // ECAL combined conditions object.
-        ecalConditions = ConditionsManager.defaultInstance()
-                .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();
-        
-        // List of channels.
-        channels = ecalConditions.getChannelCollection();
-        
-        helper = subDetector.getDetectorElement().getIdentifierHelper();
-        
-        System.out.println("You are now using the database conditions for ECalHitWriter.java");   
-    }

 
     public void setHitCollectionName(String hitCollectionName) {
         this.hitCollectionName = hitCollectionName;

@@ -129,8 +86,8 @@

         List<Object> topHits = new ArrayList<Object>();
         List<Object> bottomHits = new ArrayList<Object>();
         for (Object hit : rawCalorimeterHits) {

-//            Long daqID = EcalConditions.physicalToDaqID(getCellID(hit));
-            int crate = getCrate(getCellID(hit));

+            Long daqID = EcalConditions.physicalToDaqID(getCellID(hit));
+            int crate = EcalConditions.getCrate(daqID);

             if (crate == ECAL_BOTTOM_BANK_TAG) {
                 bottomHits.add(hit);
             } else {

@@ -193,7 +150,6 @@

 
     private long getCellID(Object hit) {
         if (RawCalorimeterHit.class.isInstance(hit)) {

-        	System.out.println("hit.getCellID() " + ((RawCalorimeterHit) hit).getCellID());

             return ((RawCalorimeterHit) hit).getCellID();
         } else if (RawTrackerHit.class.isInstance(hit)) {
             return ((RawTrackerHit) hit).getCellID();

@@ -207,7 +163,7 @@

         }
 
         // Get the ID decoder.

-        IDDecoder dec = subDetector.getIDDecoder();

+        IDDecoder dec = EcalConditions.getSubdetector().getIDDecoder();

 
         // Make a hit map; allow for multiple hits in a crystal.
         Map<Long, List<RawCalorimeterHit>> hitMap = new HashMap<Long, List<RawCalorimeterHit>>();

@@ -226,9 +182,9 @@

             dec.setID(id);
 //			System.out.println(dec.getIDDescription());
 //			System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));

-//            Long daqID = EcalConditions.physicalToDaqID(id);

+            Long daqID = EcalConditions.physicalToDaqID(id);

 //			System.out.printf("physicalID %d, daqID %d\n", id, daqID);

-            int slot = getSlot(id);

+            int slot = EcalConditions.getSlot(daqID);

             if (slotMap.get(slot) == null) {
                 slotMap.put(slot, new ArrayList<Long>());
             }

@@ -249,7 +205,7 @@

             data.addN(nhits); // number of channels
             for (Long id : hitIDs) {
                 dec.setID(id);

-                int channel = getChannel(id);

+                int channel = EcalConditions.getChannel(EcalConditions.physicalToDaqID(id));

                 data.addUchar((byte) channel); // channel #
                 List<RawCalorimeterHit> channelHits = hitMap.get(id);
                 data.addN(channelHits.size()); // number of pulses

@@ -280,7 +236,7 @@

         }
 
         // Get the ID decoder.

-        IDDecoder dec = subDetector.getIDDecoder();

+        IDDecoder dec = EcalConditions.getSubdetector().getIDDecoder();

 
         // Make a hit map; allow for multiple hits in a crystal.
         Map<Long, List<RawTrackerHit>> hitMap = new HashMap<Long, List<RawTrackerHit>>();

@@ -299,9 +255,9 @@

             dec.setID(id);
 //			System.out.println(dec.getIDDescription());
 //			System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));

-//            Long daqID = EcalConditions.physicalToDaqID(id);

+            Long daqID = EcalConditions.physicalToDaqID(id);

 //			System.out.printf("physicalID %d, daqID %d\n", id, daqID);

-            int slot = getSlot(id);

+            int slot = EcalConditions.getSlot(daqID);

             if (slotMap.get(slot) == null) {
                 slotMap.put(slot, new ArrayList<Long>());
             }

@@ -322,7 +278,7 @@

             data.addN(nhits); // number of channels
             for (Long id : hitIDs) {
                 dec.setID(id);

-                int channel = getChannel(id);

+                int channel = EcalConditions.getChannel(EcalConditions.physicalToDaqID(id));

                 data.addUchar((byte) channel); // channel #
                 List<RawTrackerHit> channelHits = hitMap.get(id);
                 data.addN(channelHits.size()); // number of pulses

@@ -357,7 +313,7 @@

         }
 
         // Get the ID decoder.

-        IDDecoder dec = subDetector.getIDDecoder();

+        IDDecoder dec = EcalConditions.getSubdetector().getIDDecoder();

 
         // Make a hit map; allow for multiple hits in a crystal.
         Map<Long, RawTrackerHit> hitMap = new HashMap<Long, RawTrackerHit>();

@@ -372,9 +328,9 @@

             dec.setID(id);
 //			System.out.println(dec.getIDDescription());
 //			System.out.printf("ix = %d, iy = %d\n", dec.getValue("ix"), dec.getValue("iy"));

-//            Long daqID = EcalConditions.physicalToDaqID(id);

+            Long daqID = EcalConditions.physicalToDaqID(id);

 //			System.out.printf("physicalID %d, daqID %d\n", id, daqID);

-            int slot = getSlot(id);

+            int slot = EcalConditions.getSlot(daqID);

             if (slotMap.get(slot) == null) {
                 slotMap.put(slot, new ArrayList<Long>());
             }

@@ -399,7 +355,7 @@

             data.addN(nhits); // number of channels
             for (Long id : hitIDs) {
                 dec.setID(id);

-                int channel = getChannel(id);

+                int channel = EcalConditions.getChannel(EcalConditions.physicalToDaqID(id));

                 data.addUchar((byte) channel); // channel #
                 RawTrackerHit hit = hitMap.get(id);
                 data.addN(hit.getADCValues().length); // number of samples

@@ -426,7 +382,7 @@

 
     @Override
     public void writeData(EventHeader event, EventHeader toEvent) {

-        String readoutName = ((org.lcsim.geometry.compact.Subdetector) subDetector).getReadout().getName();   

+        String readoutName = EcalConditions.getSubdetector().getReadout().getName();

         switch (mode) {
             case EventConstants.ECAL_WINDOW_MODE:
             case EventConstants.ECAL_PULSE_MODE:

@@ -445,49 +401,4 @@

                 break;
         }
     }

-    
- 
-    
-    /**
-     * Return crate number from cellID
-     * @param cellID (long)
-     * @return Crate number (int)
-     */
-    private int getCrate(long cellID) {
-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getCrate(helper, cellID);
-    }
-    
-    /**
-     * Return slot number from cellID
-     * @param cellID (long)
-     * @return Slot number (int)
-     */
-    private int getSlot(long cellID) {
-        EcalConditionsUtil util = new EcalConditionsUtil();
-
-        // Find the ECAL channel and return the crate number.
-        return util.getSlot(helper, cellID);         
-    }  
-    
-    private int getChannel(long cellID){
-      // Make an ID object from hit ID.
-      IIdentifier idd = new Identifier(cellID);
-    
-      // Get physical field values.
-      int system = helper.getValue(idd, "system");
-      int x = helper.getValue(idd, "ix");
-      int y = helper.getValue(idd, "iy");
-    
-      // Create an ID to search for in channel collection.
-      GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-            
-      // Get the channel data.
-      return channels.findChannel(geometryId).getChannelId(); 
-    
-    }
-    

 }

java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunEvioToLcio.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -164,7 +164,6 @@

         // LCSim job manager.
         JobControlManager jobManager = new JobControlManager();
 

-        int conditionsRunNumber = 0;

         if (cl.hasOption("D")) {
             String[] steeringOptions = cl.getOptionValues("D");
             for (String def : steeringOptions) {

@@ -175,20 +174,12 @@

                 String key = s[0];
                 String value = s[1];
                 jobManager.addVariableDefinition(key, value);

-
-                if (key.equals("runNumber")) {
-                    conditionsRunNumber = Integer.parseInt(value);
-                }

             }
         }
 
         jobManager.setup(steeringStream);
         jobManager.configure();
 

-
-        // HACK: Try to get working with new database conditions system...
-        new org.hps.conditions.config.TestRunReadOnlyConfiguration(false).setup().load(detectorName, conditionsRunNumber);
-

         // LCSim event builder.
         LCSimEventBuilder eventBuilder = new LCSimTestRunEventBuilder();
         eventBuilder.setDetectorName(detectorName);

@@ -315,4 +306,4 @@

             System.out.println("closed writer");
         }
     }

-}

+}

\ No newline at end of file

java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -2,16 +2,12 @@

 
 import java.io.IOException;
 

-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalConditions;

 import org.jlab.coda.jevio.DataType;
 import org.jlab.coda.jevio.EventBuilder;
 import org.jlab.coda.jevio.EventWriter;
 import org.jlab.coda.jevio.EvioBank;
 import org.jlab.coda.jevio.EvioException;

-import org.lcsim.conditions.ConditionsManager;

 import org.lcsim.event.EventHeader;

-import org.lcsim.geometry.Detector;

 import org.lcsim.util.Driver;
 
 /**

@@ -30,17 +26,9 @@

 	private int eventsWritten = 0;
 	ECalHitWriter ecalWriter = null;
 	SVTHitWriter svtWriter = null;

-	
-	Detector detector = null;

 
 	public TestRunReconToEvio() {
 	}

-	
-    @Override
-    public void detectorChanged(Detector detector) {    	
-    	// set the detector
-        this.detector = detector;
-    }

 
 	public void setEvioOutputFile(String evioOutputFile) {
 		this.evioOutputFile = evioOutputFile;

@@ -61,7 +49,6 @@

 		}
 
 		ecalWriter = new ECalHitWriter();

-		ecalWriter.setDetector(detector);

 		ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
 
 		svtWriter = new SVTHitWriter();

java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio

--- java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-09-11 22:07:20 UTC (rev 1009)
+++ java/branches/hps_java_trunk_HPSJAVA-251/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java	2014-09-12 02:08:45 UTC (rev 1010)
@@ -5,9 +5,8 @@

 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;

-import org.hps.conditions.DatabaseConditionsManager;

 import org.hps.conditions.deprecated.CalibrationDriver;

-import org.hps.conditions.ecal.EcalConditions;

+import org.hps.conditions.deprecated.EcalConditions;

 import org.hps.readout.ecal.ReadoutTimestamp;
 import org.hps.readout.ecal.TriggerDriver;
 import org.hps.readout.ecal.TriggerableDriver;

@@ -17,7 +16,6 @@

 import org.jlab.coda.jevio.EvioBank;
 import org.jlab.coda.jevio.EvioException;
 import org.lcsim.event.EventHeader;

-import org.lcsim.geometry.Detector;

 import org.lcsim.util.Driver;
 
 /**

@@ -41,19 +39,10 @@

     TriggerDataWriter triggerWriter = null;
     List<HitWriter> writers = null;
     private int ecalMode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;

-    
-    Detector detector;

 
     public TestRunTriggeredReconToEvio() {
         setTriggerDelay(0);
     }

-    
-    @Override
-    public void detectorChanged(Detector detector) {    	
-    	//ecalWriter.setDetector(detector);
-        if(detector == null) System.out.println("detectorChanged, Detector == null");
-        else System.out.println("detectorChanged, Detector != null");
-    }

 
     public void setEcalMode(int ecalMode) {
         this.ecalMode = ecalMode;

@@ -86,17 +75,12 @@

         }
 
         writePrestartEvent();

-        this.detector = DatabaseConditionsManager.getInstance().getDetectorObject();

 
         writers = new ArrayList<HitWriter>();
 
         ecalWriter = new ECalHitWriter();

-        if(detector == null) System.out.println("Detector == null");
-        else System.out.println("Detector != null");
-        //ecalWriter.setDetector(detector);

         ecalWriter.setMode(ecalMode);
         ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);

-        ecalWriter.setDetector(detector);

         writers.add(ecalWriter);
 
         svtWriter = new SVTHitWriter();