diff -u -r1.9 -r1.10
--- BaseRawTrackerHit.java	20 Aug 2008 01:34:21 -0000	1.9
+++ BaseRawTrackerHit.java	18 Mar 2009 04:21:00 -0000	1.10
@@ -3,16 +3,15 @@

 import java.util.List;
 
 import org.lcsim.detector.IDetectorElement;

-import org.lcsim.detector.identifier.IIdentifier;

 import org.lcsim.detector.identifier.Identifier;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.SimTrackerHit;

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

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

- * @version $Id: BaseRawTrackerHit.java,v 1.9 2008/08/20 01:34:21 jeremy Exp $

+ * @author Jeremy McCormick <[log in to unmask]>
+ * @version $Id: BaseRawTrackerHit.java,v 1.10 2009/03/18 04:21:00 jeremy Exp $

  */
 public class BaseRawTrackerHit
 extends BaseHit

@@ -21,10 +20,14 @@

     protected int time;
     protected long cellId;
     protected short[] adcValues;

-    protected LCMetaData data;

     protected List<SimTrackerHit> simTrackerHits;
 

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

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

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

@@ -35,7 +38,7 @@

     }
     
     /**

-     * Constructor for use by subclasses

+     * Constructor for use by subclasses.

      */
     protected BaseRawTrackerHit()
     {}

diff -u -r1.7 -r1.8
--- SIORawTrackerHit.java	20 Aug 2008 04:33:45 -0000	1.7
+++ SIORawTrackerHit.java	18 Mar 2009 04:21:04 -0000	1.8
@@ -19,7 +19,8 @@

  * -Added support for reading/writing list of SimTrackerHits.  FIXME: Non-standard LCIO.
  * 
  * @author Tony Johnson

- * @version $Id: SIORawTrackerHit.java,v 1.7 2008/08/20 04:33:45 jeremy Exp $

+ * @author Jeremy McCormick <[log in to unmask]>
+ * @version $Id: SIORawTrackerHit.java,v 1.8 2009/03/18 04:21:04 jeremy Exp $

  */
 class SIORawTrackerHit extends BaseRawTrackerHit
 {  

@@ -27,7 +28,7 @@

 
 	SIORawTrackerHit(SIOInputStream in, int flags, int version, LCMetaData meta) throws IOException
 	{

-		data = meta;

+	    this.meta = meta;

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