diff -u -r1.21 -r1.22
--- HPSEcalClusterer.java	4 Jun 2012 23:03:58 -0000	1.21
+++ HPSEcalClusterer.java	21 Jun 2012 18:49:52 -0000	1.22
@@ -23,7 +23,7 @@

  * @author Jeremy McCormick <[log in to unmask]>
  * @author Tim Nelson <[log in to unmask]>
  *

- * @version $Id: HPSEcalClusterer.java,v 1.21 2012/06/04 23:03:58 meeg Exp $

+ * @version $Id: HPSEcalClusterer.java,v 1.22 2012/06/21 18:49:52 meeg Exp $

  */
 public class HPSEcalClusterer extends Driver {
 

@@ -53,6 +53,9 @@

 
     public void setAddEMin(double addEMin) {
         this.addEMin = addEMin;

+        if (seedEMin < addEMin) {
+            seedEMin = addEMin;
+        }

     }
 
     public void setEcalCollectionName(String ecalCollectionName) {

diff -u -r1.16 -r1.17
--- HPSEcalReadoutDriver.java	3 Apr 2012 17:02:35 -0000	1.16
+++ HPSEcalReadoutDriver.java	21 Jun 2012 18:49:52 -0000	1.17
@@ -15,141 +15,140 @@

  * Performs readout of ECal hits.
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: HPSEcalReadoutDriver.java,v 1.16 2012/04/03 17:02:35 meeg Exp $

+ * @version $Id: HPSEcalReadoutDriver.java,v 1.17 2012/06/21 18:49:52 meeg Exp $

  */
 public abstract class HPSEcalReadoutDriver<T> extends Driver {
 

-	Subdetector ecal;
-	String ecalCollectionName;
-	String ecalName;
-	String ecalRawCollectionName = "EcalRawHits";
-	String ecalReadoutName = "EcalHits";
-	Class hitClass;
-	//hit type as in org.lcsim.recon.calorimetry.CalorimeterHitType
-	int hitType = 0;
-	//number of bunches in readout cycle
-	int readoutCycle = 1;
-	//minimum readout value to write a hit
-	double threshold = 0.0;
-	//LCIO flags
-	int flags = 0;
-	//readout period in ns
-	double readoutPeriod = 2.0;
-	//readout period time offset in ns
-	double readoutOffset = 0.0;
-	//readout period counter
-	int readoutCounter;
-	public static boolean triggerBit = false;
-
-	public HPSEcalReadoutDriver() {
-		flags += 1 << LCIOConstants.CHBIT_LONG; //store position
-		flags += 1 << LCIOConstants.RCHBIT_ID1; //store cell ID
-
-	}
-
-	public void setEcalReadoutName(String ecalReadoutName) {
-		this.ecalReadoutName = ecalReadoutName;
-	}
-
-	public void setEcalRawCollectionName(String ecalRawCollectionName) {
-		this.ecalRawCollectionName = ecalRawCollectionName;
-	}
-
-	public void setEcalCollectionName(String ecalCollectionName) {
-		this.ecalCollectionName = ecalCollectionName;
-	}
-
-	public void setEcalName(String ecalName) {
-		this.ecalName = ecalName;
-	}
-
-	public void setReadoutCycle(int readoutCycle) {
-		this.readoutCycle = readoutCycle;
-		if (readoutCycle > 0) {
-			this.readoutPeriod = readoutCycle * ClockSingleton.getDt();
-		}
-	}
-
-	public void setReadoutOffset(double readoutOffset) {
-		this.readoutOffset = readoutOffset;
-	}
-
-	public void setReadoutPeriod(double readoutPeriod) {
-		this.readoutPeriod = readoutPeriod;
-		this.readoutCycle = -1;
-	}
-
-	public void setThreshold(double threshold) {
-		this.threshold = threshold;
-	}
-
-	public void startOfData() {
-		if (ecalCollectionName == null) {
-			throw new RuntimeException("The parameter ecalCollectionName was not set!");
-		}
-
-		if (ecalName == null) {
-			throw new RuntimeException("The parameter ecalName was not set!");
-		}
-
-		readoutCounter = 0;
-
-		initReadout();
-	}
-
-	public void detectorChanged(Detector detector) {
-		// Get the Subdetector.
-		ecal = detector.getSubdetector(ecalName);
-	}
-
-	public void process(EventHeader event) {
-		//System.out.println(this.getClass().getCanonicalName() + " - process");
-		// Get the list of ECal hits.
-		List<CalorimeterHit> hits = event.get(CalorimeterHit.class, ecalCollectionName);
-		if (hits == null) {
-			throw new RuntimeException("Event is missing ECal hits collection!");
-		}
-
-		//write hits into buffers
-		putHits(hits);
-
-		ArrayList<T> newHits = new ArrayList<T>();
-
-		//if at the end of a readout cycle, write buffers to hits
-		if (readoutCycle > 0) {
-			if ((ClockSingleton.getClock() + 1) % readoutCycle == 0) {
-				readHits(newHits);
-				readoutCounter++;
-			}
-		} else {
-			while (ClockSingleton.getTime() - readoutTime() + ClockSingleton.getDt() >= readoutPeriod) {
-				readHits(newHits);
-				readoutCounter++;
-			}
-		}
-
-		event.put(ecalRawCollectionName, newHits, hitClass, flags, ecalReadoutName);
-
-		if (triggerBit) {
-			processTrigger(event);
-			triggerBit = false;
-		}
-	}
-
-	protected double readoutTime() {
-		return readoutCounter * readoutPeriod + readoutOffset;
-	}
-
-	//read analog signal out of buffers and make hits; reset buffers
-	protected abstract void readHits(List<T> hits);
-
-	//add deposited energy to buffers
-	//must be run every event, even if the list is empty
-	protected abstract void putHits(List<CalorimeterHit> hits);

+    Subdetector ecal;
+    String ecalCollectionName;
+    String ecalName;
+    String ecalRawCollectionName = "EcalRawHits";
+    String ecalReadoutName = "EcalHits";
+    Class hitClass;
+    //hit type as in org.lcsim.recon.calorimetry.CalorimeterHitType
+    int hitType = 0;
+    //number of bunches in readout cycle
+    int readoutCycle = 1;
+    //minimum readout value to write a hit
+    double threshold = 0.0;
+    //LCIO flags
+    int flags = 0;
+    //readout period in ns
+    double readoutPeriod = 2.0;
+    //readout period time offset in ns
+    double readoutOffset = 0.0;
+    //readout period counter
+    int readoutCounter;
+    public static boolean triggerBit = false;
+
+    public HPSEcalReadoutDriver() {
+        flags += 1 << LCIOConstants.CHBIT_LONG; //store position
+        flags += 1 << LCIOConstants.RCHBIT_ID1; //store cell ID
+
+    }
+
+    public void setEcalReadoutName(String ecalReadoutName) {
+        this.ecalReadoutName = ecalReadoutName;
+    }
+
+    public void setEcalRawCollectionName(String ecalRawCollectionName) {
+        this.ecalRawCollectionName = ecalRawCollectionName;
+    }
+
+    public void setEcalCollectionName(String ecalCollectionName) {
+        this.ecalCollectionName = ecalCollectionName;
+    }
+
+    public void setEcalName(String ecalName) {
+        this.ecalName = ecalName;
+    }
+
+    public void setReadoutCycle(int readoutCycle) {
+        this.readoutCycle = readoutCycle;
+        if (readoutCycle > 0) {
+            this.readoutPeriod = readoutCycle * ClockSingleton.getDt();
+        }
+    }
+
+    public void setReadoutOffset(double readoutOffset) {
+        this.readoutOffset = readoutOffset;
+    }
+
+    public void setReadoutPeriod(double readoutPeriod) {
+        this.readoutPeriod = readoutPeriod;
+        this.readoutCycle = -1;
+    }
+
+    public void setThreshold(double threshold) {
+        this.threshold = threshold;
+    }
+
+    public void startOfData() {
+        if (ecalCollectionName == null) {
+            throw new RuntimeException("The parameter ecalCollectionName was not set!");
+        }
+
+        if (ecalName == null) {
+            throw new RuntimeException("The parameter ecalName was not set!");
+        }
+
+        readoutCounter = 0;
+
+        initReadout();
+    }
+
+    public void detectorChanged(Detector detector) {
+        // Get the Subdetector.
+        ecal = detector.getSubdetector(ecalName);
+    }
+
+    public void process(EventHeader event) {
+        //System.out.println(this.getClass().getCanonicalName() + " - process");
+        // Get the list of ECal hits.        
+        if (event.hasCollection(CalorimeterHit.class, ecalCollectionName)) {
+            List<CalorimeterHit> hits = event.get(CalorimeterHit.class, ecalCollectionName);
+
+            //write hits into buffers
+            putHits(hits);
+        }
+
+        ArrayList<T> newHits = new ArrayList<T>();
+
+        //if at the end of a readout cycle, write buffers to hits
+        if (readoutCycle > 0) {
+            if ((ClockSingleton.getClock() + 1) % readoutCycle == 0) {
+                readHits(newHits);
+                readoutCounter++;
+            }
+        } else {
+            while (ClockSingleton.getTime() - readoutTime() + ClockSingleton.getDt() >= readoutPeriod) {
+                readHits(newHits);
+                readoutCounter++;
+            }
+        }
+
+        event.put(ecalRawCollectionName, newHits, hitClass, flags, ecalReadoutName);
+
+        if (triggerBit) {
+            processTrigger(event);
+            triggerBit = false;
+        }
+    }
+
+    protected double readoutTime() {
+        return readoutCounter * readoutPeriod + readoutOffset;
+    }
+
+    //read analog signal out of buffers and make hits; reset buffers
+    protected abstract void readHits(List<T> hits);
+
+    //add deposited energy to buffers
+    //must be run every event, even if the list is empty
+    protected abstract void putHits(List<CalorimeterHit> hits);

-	protected void processTrigger(EventHeader event) {
-	}

+    protected void processTrigger(EventHeader event) {
+    }

-	//initialize buffers
-	protected abstract void initReadout();

+    //initialize buffers
+    protected abstract void initReadout();

 }

\ No newline at end of file

diff -u -r1.1 -r1.2
--- TestRunTriggerDriver.java	7 Jun 2012 00:47:31 -0000	1.1
+++ TestRunTriggerDriver.java	21 Jun 2012 18:49:52 -0000	1.2
@@ -9,7 +9,7 @@

  *
  * @author Omar Moreno <[log in to unmask]>
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: TestRunTriggerDriver.java,v 1.1 2012/06/07 00:47:31 meeg Exp $

+ * @version $Id: TestRunTriggerDriver.java,v 1.2 2012/06/21 18:49:52 meeg Exp $

  */
 public class TestRunTriggerDriver extends HPSTriggerDriver {
 

@@ -37,9 +37,9 @@

 
         for (HPSEcalCluster cluster : clusters) {
             if (cluster.getEnergy() > clusterEnergyLow) {

-                trigger = true;

+                    trigger = true;
+                }

             }

-        }

         if (trigger) {
             deadtimelessTriggerCount++;
         }

diff -u -r1.4 -r1.5
--- HPSEcalCTPClusterer.java	4 Jun 2012 23:03:58 -0000	1.4
+++ HPSEcalCTPClusterer.java	21 Jun 2012 18:49:52 -0000	1.5
@@ -29,7 +29,7 @@

  * @author Jeremy McCormick <[log in to unmask]>
  * @author Tim Nelson <[log in to unmask]>
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: HPSEcalCTPClusterer.java,v 1.4 2012/06/04 23:03:58 meeg Exp $

+ * @version $Id: HPSEcalCTPClusterer.java,v 1.5 2012/06/21 18:49:52 meeg Exp $

  */
 public class HPSEcalCTPClusterer extends Driver {
 

@@ -44,10 +44,15 @@

     // Map of crystals to their neighbors.
     NeighborMap neighborMap = null;
     double clusterWindow = -1;

+    double addEMin = 0;

 
     public HPSEcalCTPClusterer() {
     }
 

+    public void setAddEMin(double addEMin) {
+        this.addEMin = addEMin;
+    }
+

     public void setClusterWindow(double clusterWindow) {
         this.clusterWindow = clusterWindow;
     }

@@ -130,7 +135,9 @@

             clusters = new ArrayList<HPSEcalCluster>();
 
             for (CalorimeterHit hit : hits) {

-                futureHits.add(hit);

+                if (hit.getRawEnergy() > addEMin) {
+                    futureHits.add(hit);
+                }

             }
 
             while (!futureHits.isEmpty()) {