Commit in hps-java/src/main/java/org/lcsim/hps on MAIN
recon/ecal/HPSEcalTimeEvolutionReadoutDriver.java+3-21.2 -> 1.3
          /HPSEcalReadoutDriver.java+9-31.8 -> 1.9
          /RawCalorimeterHit.java+11.1 -> 1.2
          /HPSEcal1BitClusterer.java+11.11 -> 1.12
          /HPSEcalSimpleReadoutDriver.java+3-21.1 -> 1.2
util/RingBuffer.java+11.1 -> 1.2
+18-7
6 modified files
add @version tags
hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcalTimeEvolutionReadoutDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- HPSEcalTimeEvolutionReadoutDriver.java	24 Aug 2011 17:26:42 -0000	1.2
+++ HPSEcalTimeEvolutionReadoutDriver.java	24 Aug 2011 21:30:14 -0000	1.3
@@ -14,6 +14,7 @@

  * Simulates time evolution of preamp output pulse.
  * 
  * @author Sho Uemura <[log in to unmask]>

+ * @version $Id: HPSEcalTimeEvolutionReadoutDriver.java,v 1.3 2011/08/24 21:30:14 meeg Exp $

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

@@ -44,9 +45,9 @@

         this.dt = dt;
     }
 

-    public List<CalorimeterHit> readHits() {

+    public List<RawCalorimeterHit> readHits() {

         IDDecoder dec = ecal.getIDDecoder();

-        List<CalorimeterHit> hitList = new ArrayList<CalorimeterHit>();

+        List<RawCalorimeterHit> hitList = new ArrayList<RawCalorimeterHit>();

         for (Long cellID : eDepMap.keySet()) {
             RingBuffer eDepBuffer = eDepMap.get(cellID);
             if (eDepBuffer.currentValue() > threshold) {
hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcalReadoutDriver.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- HPSEcalReadoutDriver.java	24 Aug 2011 17:26:42 -0000	1.8
+++ HPSEcalReadoutDriver.java	24 Aug 2011 21:30:14 -0000	1.9
@@ -13,6 +13,7 @@

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

+ * @version $Id: HPSEcalReadoutDriver.java,v 1.9 2011/08/24 21:30:14 meeg Exp $

  */
 public abstract class HPSEcalReadoutDriver extends Driver {
 

@@ -20,6 +21,7 @@

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

+    String ecalReadoutName = "EcalHits";

     //hit type as in CalorimeterHitTypeValues
     int hitType = 11;
     //counts bunches for readout clock

@@ -30,6 +32,10 @@

     public HPSEcalReadoutDriver() {
     }
 

+    public void setEcalReadoutName(String ecalReadoutName) {
+        this.ecalReadoutName = ecalReadoutName;
+    }
+

     public void setEcalRawCollectionName(String ecalRawCollectionName) {
         this.ecalRawCollectionName = ecalRawCollectionName;
     }

@@ -75,13 +81,13 @@

 
         //if at the end of a readout cycle, write buffers to hits
         if (clock % readoutCycle == 0) {

-            event.put(ecalRawCollectionName, readHits(), CalorimeterHit.class, 0);

+            event.put(ecalRawCollectionName, readHits(), RawCalorimeterHit.class, 0, ecalReadoutName);

         } else

-            event.put(ecalRawCollectionName, new ArrayList<CalorimeterHit>(), CalorimeterHit.class, 0);

+            event.put(ecalRawCollectionName, new ArrayList<RawCalorimeterHit>(), RawCalorimeterHit.class, 0, ecalReadoutName);

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

-    public abstract List<CalorimeterHit> readHits();

+    public abstract List<RawCalorimeterHit> readHits();

 
     //add deposited energy to buffers
     public abstract void putHits(List<CalorimeterHit> hits);
hps-java/src/main/java/org/lcsim/hps/recon/ecal
RawCalorimeterHit.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- RawCalorimeterHit.java	23 Aug 2011 17:08:10 -0000	1.1
+++ RawCalorimeterHit.java	24 Aug 2011 21:30:14 -0000	1.2
@@ -8,6 +8,7 @@

  * for use in ECalReadout
  *
  * @author Sho Uemura

+ * @version $Id: RawCalorimeterHit.java,v 1.2 2011/08/24 21:30:14 meeg Exp $

  */
 public class RawCalorimeterHit extends BaseCalorimeterHit {
hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcal1BitClusterer.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- HPSEcal1BitClusterer.java	24 Aug 2011 17:26:42 -0000	1.11
+++ HPSEcal1BitClusterer.java	24 Aug 2011 21:30:14 -0000	1.12
@@ -28,6 +28,7 @@

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

+ * @version $Id: HPSEcal1BitClusterer.java,v 1.12 2011/08/24 21:30:14 meeg Exp $

  */
 public class HPSEcal1BitClusterer extends Driver implements Clusterer {
hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcalSimpleReadoutDriver.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- HPSEcalSimpleReadoutDriver.java	23 Aug 2011 23:46:13 -0000	1.1
+++ HPSEcalSimpleReadoutDriver.java	24 Aug 2011 21:30:14 -0000	1.2
@@ -13,14 +13,15 @@

  * No time evolution - this just integrates all hits in a cycle.
  * 
  * @author Sho Uemura <[log in to unmask]>

+ * @version $Id: HPSEcalSimpleReadoutDriver.java,v 1.2 2011/08/24 21:30:14 meeg Exp $

  */
 public class HPSEcalSimpleReadoutDriver extends HPSEcalReadoutDriver {
     //buffer for deposited energy
     Map<Long, Double> eDepMap = null;
 

-    public List<CalorimeterHit> readHits() {

+    public List<RawCalorimeterHit> readHits() {

         IDDecoder dec = ecal.getIDDecoder();

-        List<CalorimeterHit> hitList = new ArrayList<CalorimeterHit>();

+        List<RawCalorimeterHit> hitList = new ArrayList<RawCalorimeterHit>();

         for (Long cellID : eDepMap.keySet()) {
             dec.setID(cellID);
             hitList.add(new RawCalorimeterHit(eDepMap.get(cellID), dec.getPosition(), 0.0, cellID, hitType, dec));
hps-java/src/main/java/org/lcsim/hps/util
RingBuffer.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- RingBuffer.java	19 Aug 2011 16:24:12 -0000	1.1
+++ RingBuffer.java	24 Aug 2011 21:30:14 -0000	1.2
@@ -4,6 +4,7 @@

  * Ring buffer for storing ECal (and possibly SVT) samples for trigger and readout
  *
  * @author Sho Uemura <[log in to unmask]>

+ * @version $Id: RingBuffer.java,v 1.2 2011/08/24 21:30:14 meeg Exp $

  */
 public class RingBuffer {
CVSspam 0.2.8