lcsim/src/org/lcsim/util/heprep

diff -u -r1.6 -r1.7
--- CalorimeterHitConverter.java	10 Jan 2006 19:21:47 -0000	1.6
+++ CalorimeterHitConverter.java	1 Feb 2006 21:22:37 -0000	1.7
@@ -18,7 +18,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: CalorimeterHitConverter.java,v 1.6 2006/01/10 19:21:47 tonyj Exp $

+ * @version $Id: CalorimeterHitConverter.java,v 1.7 2006/02/01 21:22:37 jeremy Exp $

  */
 class CalorimeterHitConverter implements HepRepCollectionConverter
 {

@@ -57,14 +57,15 @@

       }
       if (minEnergy == maxEnergy) maxEnergy = minEnergy + 1;
       

-      boolean hasPos = LCIOUtil.bitTest(flags,LCIOConstants.CHBIT_LONG);
-      CalorimeterIDDecoder decoder = hasPos ? null : (CalorimeterIDDecoder) meta.getIDDecoder();

+      //boolean hasPos = LCIOUtil.bitTest(flags,LCIOConstants.CHBIT_LONG);
+      //CalorimeterIDDecoder decoder = hasPos ? null : (CalorimeterIDDecoder) meta.getIDDecoder();

       for (CalorimeterHit hit : (List<CalorimeterHit>) collection)
       {
          double e = hit.getRawEnergy();
          if (Double.isNaN(e) || Double.isInfinite(e) || e <= 0) continue;

-         if (!hasPos) decoder.setID(hit.getCellID());
-         double[] pos = hasPos ?  hit.getPosition() : decoder.getPosition();

+         //if (!hasPos) decoder.setID(hit.getCellID());
+         //double[] pos = hasPos ?  hit.getPosition() : decoder.getPosition();
+         double[] pos = hit.getPosition();

          HepRepInstance instanceX = factory.createHepRepInstance(instanceTree, typeX);
          instanceX.addAttValue("energy",hit.getRawEnergy());
          if (hitColorMap != null)