diff -u -r1.7 -r1.8
--- ClusterConverter.java	2 Oct 2007 17:56:46 -0000	1.7
+++ ClusterConverter.java	5 May 2010 20:36:35 -0000	1.8
@@ -14,13 +14,14 @@

 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.EventHeader.LCMetaData;

+import org.lcsim.event.SimCalorimeterHit;

 import org.lcsim.spacegeom.CartesianPoint;
 import org.lcsim.spacegeom.SpacePoint;
 
 /**
  *
  * @author tonyj

- * @version $Id: ClusterConverter.java,v 1.7 2007/10/02 17:56:46 ngraf Exp $

+ * @version $Id: ClusterConverter.java,v 1.8 2010/05/05 20:36:35 ngraf Exp $

  */
 class ClusterConverter implements HepRepCollectionConverter
 {

@@ -98,9 +99,18 @@

                 	
                 	if (hitpos != null)
                 	{

+                                double e = 0.;
+                                if(hit instanceof SimCalorimeterHit)
+                                {
+                                    e = hit.getRawEnergy();
+                                }
+                                else
+                                {
+                                    e = hit.getCorrectedEnergy();
+                                }

                 		pos = hit.getPosition();
                 		HepRepInstance instanceX = factory.createHepRepInstance(instanceC, typeX);

-                		instanceX.addAttValue("energy",hit.getRawEnergy());

+                		instanceX.addAttValue("energy",e);

                 		instanceX.addAttValue("MarkSize",5);
                 		//instanceX.addAttValue("cluster",cluster.getEnergy());
                 		instanceX.addAttValue("color",clusterColor);

diff -u -r1.9 -r1.10
--- CalorimeterHitConverter.java	15 Sep 2009 23:23:21 -0000	1.9
+++ CalorimeterHitConverter.java	5 May 2010 20:36:35 -0000	1.10
@@ -13,11 +13,12 @@

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.EventHeader.LCMetaData;

+import org.lcsim.event.SimCalorimeterHit;

 
 /**
  *
  * @author tonyj

- * @version $Id: CalorimeterHitConverter.java,v 1.9 2009/09/15 23:23:21 jeremy Exp $

+ * @version $Id: CalorimeterHitConverter.java,v 1.10 2010/05/05 20:36:35 ngraf Exp $

  */
 class CalorimeterHitConverter implements HepRepCollectionConverter
 {

@@ -48,7 +49,16 @@

       {
          for (CalorimeterHit hit : (List<CalorimeterHit>) collection)
          {

-            double e = hit.getRawEnergy();

+             double e = 0.;
+             if(hit instanceof SimCalorimeterHit)
+             {
+                 e = hit.getRawEnergy();
+             }
+             else
+             {
+                 e = hit.getCorrectedEnergy();
+             }
+

             if (Double.isNaN(e) || Double.isInfinite(e) || e <= 0) continue;
             if (e > maxEnergy) maxEnergy = e;
             if (e < minEnergy) minEnergy = e;

@@ -60,7 +70,15 @@

       //CalorimeterIDDecoder decoder = hasPos ? null : (CalorimeterIDDecoder) meta.getIDDecoder();
       for (CalorimeterHit hit : (List<CalorimeterHit>) collection)
       {

-         double e = hit.getRawEnergy();

+          double e = 0.;
+          if(hit instanceof SimCalorimeterHit)
+          {
+            e = hit.getRawEnergy();
+          }
+          else
+          {
+              e = hit.getCorrectedEnergy();
+          }

          if (Double.isNaN(e) || Double.isInfinite(e) || e <= 0) continue;
          //if (!hasPos) decoder.setID(hit.getCellID());
          //double[] pos = hasPos ?  hit.getPosition() : decoder.getPosition();

@@ -74,10 +92,10 @@

          if (pos != null)
          {
         	 HepRepInstance instanceX = factory.createHepRepInstance(instanceTree, typeX);

-        	 instanceX.addAttValue("energy",hit.getRawEnergy());

+        	 instanceX.addAttValue("energy",e);

         	 if (hitColorMap != null)
         	 {

-        		 double v = (Math.log(hit.getRawEnergy())-Math.log(minEnergy))/(Math.log(maxEnergy)-Math.log(minEnergy));

+        		 double v = (Math.log(e)-Math.log(minEnergy))/(Math.log(maxEnergy)-Math.log(minEnergy));

         		 instanceX.addAttValue("color",hitColorMap.getColor(v,1.0f));
         	 }
         	 HepRepPoint pp = factory.createHepRepPoint(instanceX,pos[0],pos[1],pos[2]);