lcsim/src/org/lcsim/event

diff -u -r1.2 -r1.3
--- RawTrackerHit.java	13 Feb 2007 22:46:29 -0000	1.2
+++ RawTrackerHit.java	9 May 2007 19:04:55 -0000	1.3
@@ -6,7 +6,7 @@

 /**
  * A raw tracker hit (as expected in raw data from a real detector)
  * @author tonyj

- * @version $Id: RawTrackerHit.java,v 1.2 2007/02/13 22:46:29 tonyj Exp $

+ * @version $Id: RawTrackerHit.java,v 1.3 2007/05/09 19:04:55 tonyj Exp $

  */
 public interface RawTrackerHit
 {

@@ -15,10 +15,7 @@

     *  E.g. the t0 of the spectrum for the TPC. Subdetector dependent.  
     */
     int getTime();

-    /** 
-     * Returns the detector specific cell id.
-     */
-    long getCellID();

+

     /**
      * Returns the array of ADCValues. 
      * The array may be of length 1 if this detector only reads out a single value per cell.

@@ -27,16 +24,29 @@

      */ 
     short[] getADCValues();
     

+    // The next three methods are presumably to be replaced by:
+    //DetectorElement getDetectorElement();
+    //FantasticIdentifier getIdentifier(); 
+    // and perhaps (hopefully temporarily) 
+    // void setDetectorElement(DetectorElement element);
+    

     /** Returns the IDDecoder associated with this hit */
     IDDecoder getIDDecoder();
    
     /** Using the IDDecoder, returns the Subdetector associated with this hit */
     Subdetector getSubdetector();

+    /** 
+     * Returns the detector specific cell id.
+     */
+    long getCellID();

     
     /** Returns the associated SimTrackerHit. Note this may be <code>null</code>
      * if there is no associated SimTrackerHit (for example because this is a noise 
      * hit, or because there is no MC information.
      */  
     // FixMe: This should return an array of tracker hits

+    // Note, Rob is worried that returning SimTrackerHits here will force recalculation of digitizing objects
+    // while overlaying background events. 
+    //List<SimTrackerHit> getSimTrackerHit();

     SimTrackerHit getSimTrackerHit();
 }