lcsim/src/org/lcsim/util/lcio

diff -u -r1.16 -r1.17
--- SIOSimTrackerHit.java	24 Aug 2011 18:51:18 -0000	1.16
+++ SIOSimTrackerHit.java	2 Sep 2011 00:19:43 -0000	1.17
@@ -15,7 +15,7 @@

  * The SIO implementation of {@link org.lcsim.event.SimTrackerHit}.
  * @author Tony Johnson
  * @author Jeremy McCormick

- * @version $Id: SIOSimTrackerHit.java,v 1.16 2011/08/24 18:51:18 jeremy Exp $

+ * @version $Id: SIOSimTrackerHit.java,v 1.17 2011/09/02 00:19:43 jeremy Exp $

  */
 class SIOSimTrackerHit extends BaseSimTrackerHit
 {    

@@ -23,11 +23,11 @@

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

+        // Metadata.

         this.meta = meta;
         

-        // Cell ID.
-        int cellID0 = in.readInt();
-        int cellID1 = 0;

+        // Read in the two 32-bit cell IDs.
+        cellID0 = in.readInt();

         if(version >= 1060)
         {
             if(LCIOUtil.bitTest(flags, LCIOConstants.THBIT_ID1))

@@ -35,14 +35,25 @@

                 cellID1 = in.readInt();
             }
         }

+        
+        // Make the 64-bit ID.

         this.id = ((long) cellID1) << 32 | cellID0;
 

+        // Position.

         position[0] = in.readDouble();
         position[1] = in.readDouble();
         position[2] = in.readDouble();

+        
+        // Energy.

         dEdx = in.readFloat();

+        
+        // Time.

         time = in.readFloat();

-        particleref = in.readPntr();

+        
+        // MCParticle pointer.
+        particleref = in.readPntr();        
+       
+        // Momentum.

         if (LCIOUtil.bitTest(flags, LCIOConstants.THBIT_MOMENTUM))
         {
             momentum[0] = in.readFloat();

@@ -52,6 +63,7 @@

                 pathLength = in.readFloat();
         }
 

+        // Pointer tag.

         if (version > 1000)
             in.readPTag(this);
     }   

lcsim/src/org/lcsim/event/base

diff -u -r1.15 -r1.16
--- BaseSimTrackerHit.java	24 Aug 2011 18:51:17 -0000	1.15
+++ BaseSimTrackerHit.java	2 Sep 2011 00:19:43 -0000	1.16
@@ -14,7 +14,7 @@

 /**
  * A concrete implementation of SimTrackerHit.
  * @author Jeremy McCormick

- * @version $Id: BaseSimTrackerHit.java,v 1.15 2011/08/24 18:51:17 jeremy Exp $

+ * @version $Id: BaseSimTrackerHit.java,v 1.16 2011/09/02 00:19:43 jeremy Exp $

  */
 public class BaseSimTrackerHit extends BaseHitWithPosition implements SimTrackerHit
 {

@@ -23,7 +23,8 @@

     protected MCParticle mcparticle;
     protected double time;
     protected double dEdx;

-    protected int cellID;

+    protected int cellID0;
+    protected int cellID1;

     protected long id;
     protected double pathLength;
     private Hep3Vector startPoint, endPoint;

@@ -78,7 +79,7 @@

         this.mcparticle = mcparticle;
         this.time = time;
         this.dEdx = dEdx;

-        this.cellID = cellID;

+        this.cellID0 = cellID;

         this.pathLength = pathLength;
         this.meta = meta;
         this.de = de;        

@@ -123,7 +124,7 @@

     // Use {@link #getCellID64()} instead.
     public int getCellID() 
     {

-        return cellID;        

+        return cellID0;        

     }
     
     public long getCellID64()