--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java	2014-09-11 19:07:50 UTC (rev 996)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java	2014-09-11 20:12:44 UTC (rev 997)
@@ -6,7 +6,6 @@

 
 import org.hps.recon.ecal.HPSCalorimeterHit;
 import org.lcsim.event.CalorimeterHit;

-import org.lcsim.geometry.Detector;

 
 /**
  * Performs readout of ECal hits.

@@ -18,21 +17,12 @@

 public class SimpleEcalReadoutDriver extends EcalReadoutDriver<HPSCalorimeterHit> {
     //buffer for deposited energy
     Map<Long, Double> eDepMap = null;

-    
-    Detector detector = null;
-    
-    HPSCalorimeterHit h = null;

 
 	public SimpleEcalReadoutDriver() {
 		hitClass = HPSCalorimeterHit.class;
 	}
 
     @Override

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

     protected void readHits(List<HPSCalorimeterHit> hits) {
         for (Long cellID : eDepMap.keySet()) {
 //            int ix = dec.getValue("ix");

@@ -42,9 +32,7 @@

 //            if (iy == 1 && ix*side >= -10 && ix*side <= -2)
 //                continue;
             if (eDepMap.get(cellID) > threshold)

-            	h = new HPSCalorimeterHit(eDepMap.get(cellID), readoutTime(), cellID, hitType); 
-                h.setDetector(detector);
-                hits.add(h);

+                hits.add(new HPSCalorimeterHit(eDepMap.get(cellID), readoutTime(), cellID, hitType));

         }
         //reset hit integration
         eDepMap = new HashMap<Long, Double>();

--- java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TimeEvolutionEcalReadoutDriver.java	2014-09-11 19:07:50 UTC (rev 996)
+++ java/branches/hps_java_trunk_HPSJAVA-251/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TimeEvolutionEcalReadoutDriver.java	2014-09-11 20:12:44 UTC (rev 997)
@@ -6,7 +6,6 @@

 
 import org.hps.recon.ecal.HPSCalorimeterHit;
 import org.lcsim.event.CalorimeterHit;

-import org.lcsim.geometry.Detector;

 
 /**
  * Performs readout of ECal hits.

@@ -17,19 +16,12 @@

  */
 public class TimeEvolutionEcalReadoutDriver extends EcalReadoutDriver<HPSCalorimeterHit> {
 

-	Detector detector = null;
-	

     //buffer for deposited energy
     Map<Long, RingBuffer> eDepMap = null;
     //length of ring buffer (in readout cycles)
     int bufferLength = 20;
     //shaper time constant in ns; negative values generate square pulses of the given width
     double t0 = 18.0;

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

 
     public TimeEvolutionEcalReadoutDriver() {
 		hitClass = HPSCalorimeterHit.class;

@@ -53,9 +45,7 @@

 //                int iy = dec.getValue("iy");
 //                if (iy == 1 && ix == -2)
 //                    System.out.printf("Time %f, output signal %f\n", ClockSingleton.getTime(), eDepBuffer.currentValue());

-            	HPSCalorimeterHit h = new HPSCalorimeterHit(eDepBuffer.currentValue(), readoutTime(), cellID, hitType);
-            	h.setDetector(detector);
-            	hits.add(h);

+                hits.add(new HPSCalorimeterHit(eDepBuffer.currentValue(), readoutTime(), cellID, hitType));

             }
             eDepBuffer.step();
         }