hps-java/src/main/java/org/lcsim/hps/recon/ecal

diff -u -r1.1 -r1.2
--- HPSEcalTimeEvolutionReadoutDriver.java	23 Aug 2011 23:46:13 -0000	1.1
+++ HPSEcalTimeEvolutionReadoutDriver.java	24 Aug 2011 17:26:42 -0000	1.2
@@ -17,23 +17,33 @@

  */
 public class HPSEcalTimeEvolutionReadoutDriver extends HPSEcalReadoutDriver {
     //buffer for deposited energy

+

     Map<Long, RingBuffer> eDepMap = null;
     //length of ring buffer (in readout cycles)

-    int bufferLength = 1;

+    int bufferLength = 20;

     //minimum readout value to write a hit
     double threshold = 0.0;

+    //bunch spacing in ns
+    double dt = 2.0;
+    //shaper time constant in ns
+    double t0 = 18.0;

 
     public HPSEcalTimeEvolutionReadoutDriver() {
     }
 
     public void setBufferLength(int bufferLength) {
         this.bufferLength = bufferLength;

+        eDepMap = new HashMap<Long, RingBuffer>();

     }
 
     public void setThreshold(double threshold) {
         this.threshold = threshold;
     }
 

+    public void setDt(double dt) {
+        this.dt = dt;
+    }
+

     public List<CalorimeterHit> readHits() {
         IDDecoder dec = ecal.getIDDecoder();
         List<CalorimeterHit> hitList = new ArrayList<CalorimeterHit>();

@@ -56,7 +66,9 @@

                 eDepBuffer = new RingBuffer(bufferLength);
                 eDepMap.put(hit.getCellID(), eDepBuffer);
             }

-            eDepBuffer.addToCell(0, hit.getRawEnergy()); //TODO: put actual pulse shape here

+            for (int i = 0; i < bufferLength; i++) {
+                eDepBuffer.addToCell(i, hit.getRawEnergy() * pulseAmplitude(i * dt * readoutCycle - hit.getTime()));
+            }

         }
     }
 

@@ -66,4 +78,10 @@

         //initialize buffers
         eDepMap = new HashMap<Long, RingBuffer>();
     }

+
+    private double pulseAmplitude(double time) {
+        if (time < 0.0)
+            return 0.0;
+        return (time / t0) * java.lang.Math.exp(1.0 - time / t0);
+    }

 }

\ No newline at end of file

hps-java/src/main/java/org/lcsim/hps/recon/ecal

diff -u -r1.7 -r1.8
--- HPSEcalReadoutDriver.java	23 Aug 2011 23:46:13 -0000	1.7
+++ HPSEcalReadoutDriver.java	24 Aug 2011 17:26:42 -0000	1.8
@@ -1,5 +1,6 @@

 package org.lcsim.hps.recon.ecal;
 

+import java.util.ArrayList;

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

@@ -19,6 +20,7 @@

     String ecalCollectionName;
     String ecalName;
     String ecalRawCollectionName = "EcalRawHits";

+    //hit type as in CalorimeterHitTypeValues

     int hitType = 11;
     //counts bunches for readout clock
     int clock;

@@ -74,7 +76,8 @@

         //if at the end of a readout cycle, write buffers to hits
         if (clock % readoutCycle == 0) {
             event.put(ecalRawCollectionName, readHits(), CalorimeterHit.class, 0);

-        }

+        } else
+            event.put(ecalRawCollectionName, new ArrayList<CalorimeterHit>(), CalorimeterHit.class, 0);

     }
 
     //read analog signal out of buffers and make hits; reset buffers

hps-java/src/main/java/org/lcsim/hps/recon/ecal

diff -N ECalReadout.java
--- ECalReadout.java	23 Aug 2011 22:27:28 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@

-/*
- * SiDigitizer.java
- *
- * Created on August 22, 2011, 9:20 AM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package org.lcsim.hps.recon.ecal;
-
-import java.util.List;
-import org.lcsim.event.CalorimeterHit;
-
-
-/**
- * converts MC energy deposition to raw hits
- * @author meeg
- */
-public interface ECalReadout
-{
-    //read analog signal out of buffers and make hits; reset buffers
-    public List<CalorimeterHit> readHits();
-    
-    //add deposited energy to buffers
-    public void putHits(List<CalorimeterHit> hits);
-    
-    //initialize buffers
-    public void initReadout();
-}