diff -u -r1.4 -r1.5
--- BaseRawTrackerHit.java	24 May 2007 18:15:11 -0000	1.4
+++ BaseRawTrackerHit.java	25 May 2007 00:23:12 -0000	1.5
@@ -7,22 +7,24 @@

 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.IIdentifierHelper;
 import org.lcsim.detector.identifier.Identifier;

+import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.SimTrackerHit;
 import org.lcsim.geometry.IDDecoder;
 import org.lcsim.geometry.Subdetector;

+import org.lcsim.util.event.SubdetectorLocator;

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

- * @version $Id: BaseRawTrackerHit.java,v 1.4 2007/05/24 18:15:11 jeremy Exp $

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

  */
 public class BaseRawTrackerHit implements RawTrackerHit
 {
     protected int time;
     protected long cellId;
     protected short[] adcValues;

-    protected IDDecoder decoder;

+    protected LCMetaData data;

     protected List<SimTrackerHit> simTrackerHits;
     protected IIdentifier identifier;
     protected IDetectorElement detectorElement;   

@@ -32,7 +34,8 @@

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

-        this.decoder = decoder;

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

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

@@ -62,12 +65,12 @@

 
     public IDDecoder getIDDecoder()
     {

-        return decoder;

+      return data.getIDDecoder();

     }
 
     public Subdetector getSubdetector()
     {

-        return decoder.getSubdetector();

+        return SubdetectorLocator.locateSubdetector(data,cellId);

     }
 
     public List<SimTrackerHit> getSimTrackerHit()

diff -u -r1.2 -r1.3
--- SIORawTrackerHit.java	23 May 2007 20:14:28 -0000	1.2
+++ SIORawTrackerHit.java	25 May 2007 00:23:12 -0000	1.3
@@ -13,13 +13,13 @@

 /**
  * 
  * @author Tony Johnson

- * @version $Id: SIORawTrackerHit.java,v 1.2 2007/05/23 20:14:28 jeremy Exp $

+ * @version $Id: SIORawTrackerHit.java,v 1.3 2007/05/25 00:23:12 tonyj Exp $

  */
 class SIORawTrackerHit extends BaseRawTrackerHit
 {  
    SIORawTrackerHit(SIOInputStream in, int flags, int version, LCMetaData meta) throws IOException
    {

-      decoder = meta.getIDDecoder();

+      data = meta;

       int cellid0 = in.readInt();
       int cellid1 = LCIOUtil.bitTest(flags,31) ? in.readInt() : 0;
       cellId = ((long) cellid1)<<32 | cellid0;