lcsim/src/org/lcsim/util/lcio

diff -u -r1.2 -r1.3
--- LCIOConstants.java	16 Feb 2005 07:28:06 -0000	1.2
+++ LCIOConstants.java	21 Jul 2005 01:48:24 -0000	1.3
@@ -28,6 +28,22 @@

    // cellid1 stored
    public final static int CHBIT_PDG = 28;
    

+   public final static int RCHBIT_LONG = 31;
+
+   // long(1) - short(0) , incl./excl. position
+   public final static int RCHBIT_BARREL = 30;
+
+   // barrel(1) - endcap(0) 
+   public final static int RCHBIT_ID1 = 29;
+
+   // cellid1 stored
+   public final static int RCHBIT_NO_PTR = 28;
+
+ // 1: pointer tag not added
+    public final static int RCHBIT_TIME = 27;
+
+ // 1: time information stored
+   

    // PDG(1) - no PDG(0) (detailed shower contributions)
    // (raw) calorimeter hit
    public final static int RCHBIT_LONG = 31;

lcsim/src/org/lcsim/util/lcio

diff -u -r1.1 -r1.2
--- SIOCalorimeterHit.java	20 Jul 2005 21:11:06 -0000	1.1
+++ SIOCalorimeterHit.java	21 Jul 2005 01:48:24 -0000	1.2
@@ -10,7 +10,7 @@

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

- * @version $Id: SIOCalorimeterHit.java,v 1.1 2005/07/20 21:11:06 lima Exp $

+ * @version $Id: SIOCalorimeterHit.java,v 1.2 2005/07/21 01:48:24 tonyj Exp $

  */
 class SIOCalorimeterHit implements CalorimeterHit
 {

@@ -19,10 +19,11 @@

    private float _energy;
    private float _time;
 

+

    SIOCalorimeterHit(SIOInputStream in, int flags, int version) throws IOException
    {
       _cellid0 = in.readInt();

-      if (LCIOUtil.bitTest(flags,LCIOConstants.CHBIT_ID1) || version==8) {

+      if (LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_ID1) || version==8) {

 	  _cellid1 = in.readInt();
       }
       else _cellid1 = 0;

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

       _energy = in.readFloat();
       _time = in.readFloat();
 

-//       if (!LCIOUtil.bitTest(flags,LCIOConstants.CHBIT_NO_PTR)) in.readPTag(this);

+      if (!LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_NO_PTR)) in.readPTag(this);

    }
 
    public long getCellID() {

@@ -60,15 +61,16 @@

    {
       long cellID = hit.getCellID();
       out.writeInt( (int)cellID );

-      if( LCIOUtil.bitTest( flags, LCIOConstants.CHBIT_ID1)) {

+      
+      if( LCIOUtil.bitTest( flags, LCIOConstants.RCHBIT_ID1)) {

 	  out.writeInt((int) (cellID>>32));
       }
 
       out.writeFloat( (float)hit.getEnergy() );
       out.writeFloat( (float)hit.getTime() );
 

-//       if(!LCIOUtil.bitTest(flags,LCIOConstants.CHBIT_NO_PTR)) {
-// 	  out.writePTag( hit );
-//       }

+       if(!LCIOUtil.bitTest(flags,LCIOConstants.RCHBIT_NO_PTR)) {
+ 	  out.writePTag( hit );
+       }

    }
 }