Print

Print


Commit in SlicDiagnostics/src/org/lcsim/slic/diagnostics on MAIN
GenericHit.java+16-91.9 -> 1.10
JM: Add system ID to GenericHit

SlicDiagnostics/src/org/lcsim/slic/diagnostics
GenericHit.java 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- GenericHit.java	11 Feb 2006 02:49:23 -0000	1.9
+++ GenericHit.java	17 Feb 2006 01:27:13 -0000	1.10
@@ -14,10 +14,11 @@
  * to access generic hit information like position, energy, etc. 
  * 
  * @author jeremym
- * @version $Id: GenericHit.java,v 1.9 2006/02/11 02:49:23 jeremy Exp $
+ * @version $Id: GenericHit.java,v 1.10 2006/02/17 01:27:13 jeremy Exp $
  */
 class GenericHit
 {
+    private int _system;
     private double _energy;
     private double[] _position;
     private int _layer;
@@ -27,7 +28,7 @@
     HitType _hitType;
     String _collName;
     
-    public GenericHit(HitType hitType, String collName, double energy, double[] position, int layer, double time)
+    public GenericHit(HitType hitType, String collName, double energy, double[] position, int layer, double time, int system)
     {
         _hitType = hitType;
         _collName = collName;
@@ -35,6 +36,7 @@
         _position = position;
         _layer = layer;
         _time = time;
+        _system = system;
     }
     
     public double getEnergy()
@@ -97,6 +99,11 @@
         return _hitType;
     }
     
+    public int getSystem()
+    {
+        return _system;
+    }
+    
     public String getCollectionName()
     {
         return _collName;
@@ -131,15 +138,15 @@
     {
         IDDecoder decoder = meta.getIDDecoder();
         decoder.setID(trackerHit.getCellID() );
-        int layer = decoder.getLayer();
-        
+               
         return new GenericHit(
                 HitType.TRACKER,
                 meta.getName(),
                 trackerHit.getdEdx(),
                 trackerHit.getPoint(),
-                layer,
-                trackerHit.getTime()
+                decoder.getLayer(),
+                trackerHit.getTime(),
+                decoder.getSystemID()
                 );
     }
 
@@ -148,15 +155,15 @@
     {
         IDDecoder decoder = meta.getIDDecoder();
         decoder.setID(calorimeterHit.getCellID() );
-        int layer = decoder.getLayer();
         
         return new GenericHit(
                 HitType.CALORIMETER,
                 meta.getName(),
                 calorimeterHit.getRawEnergy(),
                 calorimeterHit.getPosition(),
-                layer,
-                calorimeterHit.getTime()
+                decoder.getLayer(),
+                calorimeterHit.getTime(),
+                decoder.getSystemID()
                 );
     }    
 }
\ No newline at end of file
CVSspam 0.2.8