diff -u -r1.17 -r1.18
--- HPSEcalClusterer.java	22 Nov 2011 01:12:41 -0000	1.17
+++ HPSEcalClusterer.java	4 May 2012 16:35:44 -0000	1.18
@@ -7,7 +7,6 @@

 import java.util.Set;
 
 import org.lcsim.event.CalorimeterHit;

-import org.lcsim.event.Cluster;

 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.subdetector.HPSEcal3.NeighborMap;

@@ -24,141 +23,147 @@

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

- * @version $Id: HPSEcalClusterer.java,v 1.17 2011/11/22 01:12:41 meeg Exp $

+ * @version $Id: HPSEcalClusterer.java,v 1.18 2012/05/04 16:35:44 meeg Exp $

  */
 public class HPSEcalClusterer extends Driver {
 

-	HPSEcal3 ecal;
-	String ecalCollectionName;
-	String ecalName;
-	String clusterCollectionName = "EcalClusters";
-	// Minimum E for cluster seed.
-	double seedEMin = .05;
-	// Minimum E to add hit to cluster.
-	double addEMin = .03;
-	// Odd or even number of crystals in X.
-	boolean oddX;
-	// Map of crystals to their neighbors.
-	NeighborMap neighborMap = null;
-
-	public HPSEcalClusterer() {
-	}
-
-	public void setClusterCollectionName(String clusterCollectionName) {
-		this.clusterCollectionName = clusterCollectionName;
-	}
-
-	public void setSeedEMin(double seedEMin) {
-		this.seedEMin = seedEMin;
-	}
-
-	public void setAddEMin(double addEMin) {
-		this.addEMin = addEMin;
-	}
-
-	public void setEcalCollectionName(String ecalCollectionName) {
-		this.ecalCollectionName = ecalCollectionName;
-	}
-
-	public void setEcalName(String ecalName) {
-		this.ecalName = ecalName;
-	}
-
-	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!");
-	}
-
-	public void detectorChanged(Detector detector) {
-		// Get the Subdetector.
-		ecal = (HPSEcal3) detector.getSubdetector(ecalName);
-
-		// Cache ref to neighbor map.
-		neighborMap = ecal.getNeighborMap();
-
-		//System.out.println(ecal.getName());
-		//System.out.println("  nx="+ecal.nx());
-		//System.out.println("  ny="+ecal.ny());
-		//System.out.println("  beamgap="+ecal.beamGap());
-		//System.out.println("  dface="+ecal.distanceToFace());
-
-		//System.out.println(neighborMap.toString());
-	}
-
-	public void process(EventHeader event) {
-		//System.out.println(this.getClass().getCanonicalName() + " - process");
-
-		// Get the list of raw ECal hits.
-		List<CalorimeterHit> hits = event.get(CalorimeterHit.class, ecalCollectionName);
-		if (hits == null)
-			throw new RuntimeException("Event is missing ECal raw hits collection!");
-
-		// Make a hit map for quick lookup by ID.
-		Map<Long, CalorimeterHit> hitMap = new HashMap<Long, CalorimeterHit>();
-		for (CalorimeterHit hit : hits) {
-			hitMap.put(hit.getCellID(), hit);
-		}
-
-		// Put Cluster collection into event.
-		int flag = 1 << LCIOConstants.CLBIT_HITS;
-		event.put(clusterCollectionName, createClusters(hitMap), Cluster.class, flag);
-	}
-
-	public List<Cluster> createClusters(Map<Long, CalorimeterHit> map) {
-
-		// New Cluster list to be added to event.
-		List<Cluster> clusters = new ArrayList<Cluster>();
-
-		// Loop over ECal hits to find cluster seeds.
-		for (CalorimeterHit hit : map.values()) {
-			// Cut on min seed E.
-			if (hit.getRawEnergy() < seedEMin)
-				continue;
-
-			// Get neighbor crystal IDs.
-			Set<Long> neighbors = neighborMap.get(hit.getCellID());
-
-			if (neighbors == null)
-				throw new RuntimeException("Oops!  Set of neighbors is null!");
-
-			// List for neighboring hits.
-			List<CalorimeterHit> neighborHits = new ArrayList<CalorimeterHit>();
-
-			// Loop over neighbors to make hit list for cluster.
-			boolean isSeed = true;
-			for (Long neighborId : neighbors) {
-				// Find the neighbor hit in the event if it exists.
-				CalorimeterHit neighborHit = map.get(neighborId);
-
-				// Was this neighbor cell hit?
-				if (neighborHit != null) {
-					// Check if neighbor cell has more energy.
-					if (neighborHit.getRawEnergy() > hit.getRawEnergy()) {
-						// Neighbor has more energy, so cell is not a seed.
-						isSeed = false;
-						break;
-					}
-
-					// Add to cluster if above min E.
-					if (neighborHit.getRawEnergy() >= addEMin) {
-						neighborHits.add(neighborHit);
-					}
-				}
-			}
-
-			// Did we find a seed?
-			if (isSeed) {
-				// Make a cluster from the hit list.
-				HPSEcalCluster cluster = new HPSEcalCluster(hit);
-				for (CalorimeterHit clusHit : neighborHits) {
-					cluster.addHit(clusHit);
-				}
-				clusters.add(cluster);
-			}
-		}
-		return clusters;
-	}

+    HPSEcal3 ecal;
+    String ecalCollectionName;
+    String ecalName;
+    String clusterCollectionName = "EcalClusters";
+    // Minimum E for cluster seed.
+    double seedEMin = .05;
+    // Minimum E to add hit to cluster.
+    double addEMin = .03;
+    // Odd or even number of crystals in X.
+    boolean oddX;
+    // Map of crystals to their neighbors.
+    NeighborMap neighborMap = null;
+
+    public HPSEcalClusterer() {
+    }
+
+    public void setClusterCollectionName(String clusterCollectionName) {
+        this.clusterCollectionName = clusterCollectionName;
+    }
+
+    public void setSeedEMin(double seedEMin) {
+        this.seedEMin = seedEMin;
+    }
+
+    public void setAddEMin(double addEMin) {
+        this.addEMin = addEMin;
+    }
+
+    public void setEcalCollectionName(String ecalCollectionName) {
+        this.ecalCollectionName = ecalCollectionName;
+    }
+
+    public void setEcalName(String ecalName) {
+        this.ecalName = ecalName;
+    }
+
+    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!");
+        }
+    }
+
+    public void detectorChanged(Detector detector) {
+        // Get the Subdetector.
+        ecal = (HPSEcal3) detector.getSubdetector(ecalName);
+
+        // Cache ref to neighbor map.
+        neighborMap = ecal.getNeighborMap();
+
+        //System.out.println(ecal.getName());
+        //System.out.println("  nx="+ecal.nx());
+        //System.out.println("  ny="+ecal.ny());
+        //System.out.println("  beamgap="+ecal.beamGap());
+        //System.out.println("  dface="+ecal.distanceToFace());
+
+        //System.out.println(neighborMap.toString());
+    }
+
+    public void process(EventHeader event) {
+        //System.out.println(this.getClass().getCanonicalName() + " - process");
+
+        // Get the list of raw ECal hits.
+        List<CalorimeterHit> hits = event.get(CalorimeterHit.class, ecalCollectionName);
+        if (hits == null) {
+            throw new RuntimeException("Event is missing ECal raw hits collection!");
+        }
+
+        // Make a hit map for quick lookup by ID.
+        Map<Long, CalorimeterHit> hitMap = new HashMap<Long, CalorimeterHit>();
+        for (CalorimeterHit hit : hits) {
+            hitMap.put(hit.getCellID(), hit);
+        }
+
+        // Put Cluster collection into event.
+        int flag = 1 << LCIOConstants.CLBIT_HITS;
+        event.put(clusterCollectionName, createClusters(hitMap), HPSEcalCluster.class, flag);
+        System.out.println("Made clusters");
+    }
+
+    public List<HPSEcalCluster> createClusters(Map<Long, CalorimeterHit> map) {
+
+        // New Cluster list to be added to event.
+        List<HPSEcalCluster> clusters = new ArrayList<HPSEcalCluster>();
+
+        // Loop over ECal hits to find cluster seeds.
+        for (CalorimeterHit hit : map.values()) {
+            // Cut on min seed E.
+            if (hit.getRawEnergy() < seedEMin) {
+                continue;
+            }
+
+            // Get neighbor crystal IDs.
+            Set<Long> neighbors = neighborMap.get(hit.getCellID());
+
+            if (neighbors == null) {
+                throw new RuntimeException("Oops!  Set of neighbors is null!");
+            }
+
+            // List for neighboring hits.
+            List<CalorimeterHit> neighborHits = new ArrayList<CalorimeterHit>();
+
+            // Loop over neighbors to make hit list for cluster.
+            boolean isSeed = true;
+            for (Long neighborId : neighbors) {
+                // Find the neighbor hit in the event if it exists.
+                CalorimeterHit neighborHit = map.get(neighborId);
+
+                // Was this neighbor cell hit?
+                if (neighborHit != null) {
+                    // Check if neighbor cell has more energy.
+                    if (neighborHit.getRawEnergy() > hit.getRawEnergy()) {
+                        // Neighbor has more energy, so cell is not a seed.
+                        isSeed = false;
+                        break;
+                    }
+
+                    // Add to cluster if above min E.
+                    if (neighborHit.getRawEnergy() >= addEMin) {
+                        neighborHits.add(neighborHit);
+                    }
+                }
+            }
+
+            // Did we find a seed?
+            if (isSeed) {
+                // Make a cluster from the hit list.
+                HPSEcalCluster cluster = new HPSEcalCluster(hit);
+                for (CalorimeterHit clusHit : neighborHits) {
+                    cluster.addHit(clusHit);
+                }
+                clusters.add(cluster);
+            }
+        }
+        return clusters;
+    }

 }

\ No newline at end of file

diff -u -r1.2 -r1.3
--- HPSEcalRawConverterDriver.java	3 May 2012 00:17:54 -0000	1.2
+++ HPSEcalRawConverterDriver.java	4 May 2012 16:35:44 -0000	1.3
@@ -1,107 +1,91 @@

-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */

 package org.lcsim.hps.recon.ecal;
 
 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.event.RawTrackerHit;
 import org.lcsim.geometry.Detector;

-import org.lcsim.geometry.Subdetector;

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

- * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSEcalRawConverterDriver.java,v 1.2 2012/05/03 00:17:54 phansson Exp $

+ * @version $Id: HPSEcalRawConverterDriver.java,v 1.2 2012/05/03 00:17:54
+ * phansson Exp $

  */
 public class HPSEcalRawConverterDriver extends Driver {
 

-	HPSEcalRawConverter converter = null;
-	Subdetector ecal;
-	String rawCollectionName = "EcalReadoutHits";
-	String ecalName;
-	String ecalReadoutName = "EcalHits";
-	String ecalCollectionName = "EcalCalHits";
-	boolean debug = false;
-
-        
-	public HPSEcalRawConverterDriver() {
-		converter = new HPSEcalRawConverter(null);
-                
-	}
-
-	public void setPedestal(double pedestal) {
-		converter.setPedestal(pedestal);
-	}
-
-	public void setScale(double scale) {
-		converter.setScale(scale);
-	}
-
-	public void setEcalCollectionName(String ecalCollectionName) {
-		this.ecalCollectionName = ecalCollectionName;
-	}
-
-	public void setEcalName(String ecalName) {
-		this.ecalName = ecalName;
-	}
-
-	public void setRawCollectionName(String rawCollectionName) {
-		this.rawCollectionName = rawCollectionName;
-	}
-
-       
-      
-        
-	@Override
-	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!");
-		}
-	}
-
-	@Override
-	public void detectorChanged(Detector detector) {
-		// Get the Subdetector.
-		ecal = (Subdetector) detector.getSubdetector(ecalName);
-		//converter.setIDDecoder(ecal.getIDDecoder());
-                converter.setSubDetector(ecal);
-	}
-
-	@Override
-	public void process(EventHeader event) {
-		// Get the list of ECal hits.
-		List<RawTrackerHit> hits = event.get(RawTrackerHit.class, rawCollectionName);
-		if (hits == null) {
-			throw new RuntimeException("Event is missing ECal \"tracker hits\" collection!");
-		}
-
-		ArrayList<CalorimeterHit> newHits = new ArrayList<CalorimeterHit>();
-
-		for (RawTrackerHit hit : hits) {
-                    newHits.add(converter.HitDtoA(hit));
-                }
-                int flags = 0;
-		event.put(ecalCollectionName, newHits, CalorimeterHit.class, flags, ecalReadoutName);
-                String s = ecalCollectionName; //"EcalCalHits";
-                
-                System.out.println(" char: " + event.hasCollection(CalorimeterHit.class, "EcalCalHits"));
-                System.out.println(" str: " + event.hasCollection(CalorimeterHit.class, ecalCollectionName));
-                
-                List<CalorimeterHit> ll = event.get(CalorimeterHit.class,s);
-                
-                System.out.println("ll size " + ll.size());
-                List<List<CalorimeterHit>> lll = event.get(CalorimeterHit.class);
-                System.out.println("lll size " + lll.size());
-                
-                
-	}

+    HPSEcalRawConverter converter = null;
+    String rawCollectionName = "EcalReadoutHits";
+    String ecalReadoutName = "EcalHits";
+    String ecalCollectionName = "EcalCalHits";
+    int integralWindow = 30;
+    boolean debug = false;
+
+    public HPSEcalRawConverterDriver() {
+        converter = new HPSEcalRawConverter();
+    }
+
+    public void setEcalCollectionName(String ecalCollectionName) {
+        this.ecalCollectionName = ecalCollectionName;
+    }
+
+    public void setRawCollectionName(String rawCollectionName) {
+        this.rawCollectionName = rawCollectionName;
+    }
+
+    @Override
+    public void startOfData() {
+        if (ecalCollectionName == null) {
+            throw new RuntimeException("The parameter ecalCollectionName was not set!");
+        }
+    }
+
+    @Override
+    public void detectorChanged(Detector detector) {
+    }
+
+    @Override
+    public void process(EventHeader event) {
+        ArrayList<CalorimeterHit> newHits = new ArrayList<CalorimeterHit>();
+
+        // Get the list of ECal hits.
+        if (event.hasCollection(RawTrackerHit.class, rawCollectionName)) {
+            List<RawTrackerHit> hits = event.get(RawTrackerHit.class, rawCollectionName);
+
+            for (RawTrackerHit hit : hits) {
+                newHits.add(converter.HitDtoA(hit));
+            }
+//                String s = ecalCollectionName; //"EcalCalHits";
+//                
+//                System.out.println(" char: " + event.hasCollection(CalorimeterHit.class, "EcalCalHits"));
+//                System.out.println(" str: " + event.hasCollection(CalorimeterHit.class, ecalCollectionName));
+//                
+//                List<CalorimeterHit> ll = event.get(CalorimeterHit.class,s);
+//                
+//                System.out.println("ll size " + ll.size());
+//                List<List<CalorimeterHit>> lll = event.get(CalorimeterHit.class);
+//                System.out.println("lll size " + lll.size());
+        }
+        if (event.hasCollection(RawCalorimeterHit.class, rawCollectionName)) {
+            List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, rawCollectionName);
+
+            for (RawCalorimeterHit hit : hits) {
+                newHits.add(converter.HitDtoA(hit, integralWindow));
+            }
+//                String s = ecalCollectionName; //"EcalCalHits";
+//                
+//                System.out.println(" char: " + event.hasCollection(CalorimeterHit.class, "EcalCalHits"));
+//                System.out.println(" str: " + event.hasCollection(CalorimeterHit.class, ecalCollectionName));
+//                
+//                List<CalorimeterHit> ll = event.get(CalorimeterHit.class,s);
+//                
+//                System.out.println("ll size " + ll.size());
+//                List<List<CalorimeterHit>> lll = event.get(CalorimeterHit.class);
+//                System.out.println("lll size " + lll.size());
+        }
+        int flags = 0;
+        event.put(ecalCollectionName, newHits, CalorimeterHit.class, flags, ecalReadoutName);
+    }

 }

diff -u -r1.3 -r1.4
--- AIDAFrame.java	4 May 2012 02:24:43 -0000	1.3
+++ AIDAFrame.java	4 May 2012 16:35:44 -0000	1.4
@@ -8,7 +8,7 @@

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

- * @version $Id: AIDAFrame.java,v 1.3 2012/05/04 02:24:43 meeg Exp $

+ * @version $Id: AIDAFrame.java,v 1.4 2012/05/04 16:35:44 meeg Exp $

  */
 public class AIDAFrame extends JFrame {
 

@@ -18,7 +18,6 @@

 
     public AIDAFrame() {
         tabbedPane = new JTabbedPane();

-//        this.setContentPane(tabbedFrame);

         this.getContentPane().setLayout(new BorderLayout());
 
         menubar = new JMenuBar();