lcsim/src/org/lcsim/util/heprep

diff -u -r1.4 -r1.5
--- CalorimeterHitConverter.java	4 Aug 2005 08:04:29 -0000	1.4
+++ CalorimeterHitConverter.java	26 Aug 2005 00:47:12 -0000	1.5
@@ -18,7 +18,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: CalorimeterHitConverter.java,v 1.4 2005/08/04 08:04:29 ngraf Exp $

+ * @version $Id: CalorimeterHitConverter.java,v 1.5 2005/08/26 00:47:12 tonyj Exp $

  */
 class CalorimeterHitConverter implements HepRepCollectionConverter
 {

@@ -50,8 +50,9 @@

          for (CalorimeterHit hit : (List<CalorimeterHit>) collection)
          {
             double e = hit.getRawEnergy();

+            if (Double.isNaN(e) || Double.isInfinite(e) || e <= 0) continue;

             if (e > maxEnergy) maxEnergy = e;

-            if (e > 0 && e < minEnergy) minEnergy = e;

+            if (e < minEnergy) minEnergy = e;

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

@@ -60,6 +61,8 @@

       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;

          double[] pos = hasPos ?  hit.getPosition() : decoder.getPosition();
          HepRepInstance instanceX = factory.createHepRepInstance(instanceTree, typeX);
          instanceX.addAttValue("energy",hit.getRawEnergy());