lcsim/src/org/lcsim/util/lcio

diff -u -r1.4 -r1.5
--- SIOCalorimeterHit.java	2 Aug 2005 17:18:06 -0000	1.4
+++ SIOCalorimeterHit.java	25 Aug 2005 23:53:35 -0000	1.5
@@ -14,7 +14,7 @@

  * SIO-based I/O implementation of the CalorimeterHit interface
  *
  * @author Guilherme Lima

- * @version $Id: SIOCalorimeterHit.java,v 1.4 2005/08/02 17:18:06 tonyj Exp $

+ * @version $Id: SIOCalorimeterHit.java,v 1.5 2005/08/25 23:53:35 lima Exp $

  */
 class SIOCalorimeterHit extends BaseCalorimeterHit
 {

@@ -26,8 +26,8 @@

       if (LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_ID1) || version==8) {
 	 cellid1 = in.readInt();
       }

-      id = ((long) cellid1)<<32 | cellid0;
-      rawEnergy = in.readFloat();

+      this.id = ((long) cellid1)<<32 | cellid0;
+      this.rawEnergy = in.readFloat();

 
       if( LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_TIME) || version==8) {
          time = in.readFloat();

@@ -36,12 +36,12 @@

       int type = in.readInt();
 
       if (!LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_NO_PTR)) {

-	  SIORef rawhit = in.readPntr();

+ 	  SIORef rawhit = in.readPntr();

       }
 
       in.readPTag(this);
    }

-   

+

    static void write(CalorimeterHit hit, SIOOutputStream out, int flags) throws IOException
    {
       long cellID = hit.getCellID();

@@ -63,8 +63,8 @@

 
       // FIXME: Java CalorimeterHit interface does not support getRawHit()
       if(!LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_NO_PTR)) {

-	  assert false : "Pointer to raw hit not implemented!";
-// 	  out.writePntr( hit.getRawHit() );

+  	  assert false : "Pointer to raw hit not implemented!";
+//   	  out.writePntr( hit.getRawHit() );

       }
 
       out.writePTag( hit );