lcsim/test/org/lcsim/detector/driver

diff -u -r1.2 -r1.3
--- RawTrackerHitReadoutDriverTest.java	24 May 2007 18:15:45 -0000	1.2
+++ RawTrackerHitReadoutDriverTest.java	3 Jul 2007 23:15:32 -0000	1.3
@@ -9,6 +9,7 @@

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.util.Driver;
 import org.lcsim.util.cache.FileCache;

+import org.lcsim.util.loop.LCIODriver;

 import org.lcsim.util.loop.LCSimLoop;
 
 /**

@@ -30,6 +31,7 @@

         writeLoop.add(new SimTrackerHitIdentifierReadoutDriver(new String[] { "SiTrackerBarrel_RO" } ));
         writeLoop.add(new ExampleRawTrackerHitReadoutDriver());
         writeLoop.add(new CheckDriver());

+        writeLoop.add(new LCIODriver("rawhits.slcio"));

         writeLoop.loop(1);
         writeLoop.dispose();        
     }    

lcsim/src/org/lcsim/event/base

diff -u -r1.5 -r1.6
--- BaseRawTrackerHit.java	25 May 2007 00:23:12 -0000	1.5
+++ BaseRawTrackerHit.java	3 Jul 2007 23:15:32 -0000	1.6
@@ -17,7 +17,7 @@

 /**
  * A basic implementation of RawTrackerHit.
  * @author Tony Johnson

- * @version $Id: BaseRawTrackerHit.java,v 1.5 2007/05/25 00:23:12 tonyj Exp $

+ * @version $Id: BaseRawTrackerHit.java,v 1.6 2007/07/03 23:15:32 jeremy Exp $

  */
 public class BaseRawTrackerHit implements RawTrackerHit
 {

@@ -29,17 +29,16 @@

     protected IIdentifier identifier;
     protected IDetectorElement detectorElement;   
 

-    public BaseRawTrackerHit(int time, long cellId, short[] adcValues, IDDecoder decoder, List<SimTrackerHit> simTrackerHits, IDetectorElement detectorElement)

+    public BaseRawTrackerHit(int time, long cellId, short[] adcValues, List<SimTrackerHit> simTrackerHits, IDetectorElement detectorElement)

     {
         this.time = time;
         this.cellId = cellId;
         this.adcValues = adcValues;

-        // Fixme -- we need metadata not decoder
-        //this.decoder = decoder;

         this.simTrackerHits = simTrackerHits;
         this.identifier = new Identifier(cellId);
         this.detectorElement = detectorElement;
     }

+    

     /**
      * Constructor for use by subclasses
      */

@@ -63,16 +62,6 @@

         return adcValues;
     }
 

-    public IDDecoder getIDDecoder()
-    {
-      return data.getIDDecoder();
-    }
-
-    public Subdetector getSubdetector()
-    {
-        return SubdetectorLocator.locateSubdetector(data,cellId);
-    }
-

     public List<SimTrackerHit> getSimTrackerHit()
     {
         return simTrackerHits;

lcsim/src/org/lcsim/event

diff -u -r1.5 -r1.6
--- RawTrackerHit.java	23 May 2007 20:14:27 -0000	1.5
+++ RawTrackerHit.java	3 Jul 2007 23:15:32 -0000	1.6
@@ -4,14 +4,12 @@

 
 import org.lcsim.detector.IDetectorElementMixin;
 import org.lcsim.detector.identifier.IIdentifiable;

-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.geometry.Subdetector;

 
 /**

- * A raw tracker hit (as expected in raw data from a real detector)

+ * A raw tracker hit, as expected in raw data from a real detector.
+ * 

  * @author tonyj

- * @version $Id: RawTrackerHit.java,v 1.5 2007/05/23 20:14:27 jeremy Exp $

+ * @version $Id: RawTrackerHit.java,v 1.6 2007/07/03 23:15:32 jeremy Exp $

  */
 public interface RawTrackerHit
 extends IIdentifiable, IDetectorElementMixin

@@ -28,31 +26,17 @@

      * The value may also need decoding (for example the KPiX chip uses one bit as a
      * range indicator).
      */ 

-    short[] getADCValues();

+    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>

+    /** 
+     * 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();    

 }

\ No newline at end of file

lcsim/src/org/lcsim/detector/driver

diff -u -r1.2 -r1.3
--- ExampleRawTrackerHitReadoutDriver.java	25 May 2007 20:17:09 -0000	1.2
+++ ExampleRawTrackerHitReadoutDriver.java	3 Jul 2007 23:15:32 -0000	1.3
@@ -26,7 +26,7 @@

  * {@link org.lcsim.event.RawTrackerHit}s from {@link SimTrackerHit} collections.
  * 
  * @author Jeremy McCormick

- * @version $Id: ExampleRawTrackerHitReadoutDriver.java,v 1.2 2007/05/25 20:17:09 jeremy Exp $

+ * @version $Id: ExampleRawTrackerHitReadoutDriver.java,v 1.3 2007/07/03 23:15:32 jeremy Exp $

  */
 public class ExampleRawTrackerHitReadoutDriver
 extends Driver

@@ -84,10 +84,11 @@

                                     new BaseRawTrackerHit(
                                             0,                         // time    
                                             (long)aSimHit.getCellID(), // cellId

-                                            new short[]{},             // adcValues 
-                                            aSimHit.getIDDecoder(),    // IDDecoder 

+                                            new short[]{},             // adcValues  

                                             simHits,                   // SimTrackerHits

-                                            deHit.get(0));             // DetectorElement                                

+                                            deHit.get(0));             // DetectorElement       
+                                
+                                rawHits.add(rawHit);

 
                                 // Add the hit to the DetectorElement's Readout.
                                 IReadout ro = deHit.get(0).getReadout();