lcsim/src/org/lcsim/digisim

diff -u -r1.1 -r1.2
--- MyCalorimeterHit.java	20 Jul 2005 21:14:49 -0000	1.1
+++ MyCalorimeterHit.java	26 Jul 2005 23:59:46 -0000	1.2
@@ -7,15 +7,17 @@

  * Implements a calorimeter hit, to be created from unpacking DigiSim output.
  *
  * @author Guilherme Lima

- * @version $Id: MyCalorimeterHit.java,v 1.1 2005/07/20 21:14:49 lima Exp $

+ * @version $Id: MyCalorimeterHit.java,v 1.2 2005/07/26 23:59:46 lima Exp $

  */
 public class MyCalorimeterHit implements CalorimeterHit
 {
     /** Full constructor */
     MyCalorimeterHit(RawCalorimeterHit rawhit) {
 	_cellid = rawhit.getCellID();

-	_energy = ((double)rawhit.getAmplitude())/1000000;
-	_timeStamp = (double)rawhit.getTimeStamp()/1000000;

+	_energy = ((double)rawhit.getAmplitude())/100000000;
+	_timeStamp = (double)rawhit.getTimeStamp()/100000000;
+	_rawhit = rawhit;
+	_type = 0;

     }
 
     /** Channel ID for this raw hit */

@@ -33,10 +35,14 @@

 	return _timeStamp;
     }
 

-   public double[] getPosition() {
-       double[] pos = new double[3];
-       return pos;
-   }

+    public double[] getPosition() {
+	double[] pos = new double[3];
+	return pos;
+    }
+
+    public int getType() {
+	return _type;
+    }

 
     //=== FIELDS ===
 

@@ -46,4 +52,8 @@

     private double _energy;
     /** Time stamp */
     private double _timeStamp;

+    /** Reference to the corresponding raw hit */
+    private RawCalorimeterHit _rawhit;
+    /** Type of calorimeter hit */
+    private int _type;

 }