lcsim/src/org/lcsim/event/base

diff -u -r1.3 -r1.4
--- CalorimeterHitImpl.java	20 Jul 2012 09:23:15 -0000	1.3
+++ CalorimeterHitImpl.java	5 Feb 2013 00:18:34 -0000	1.4
@@ -8,7 +8,7 @@

  *
  * @author Norman A. Graf
  *

- * @version $Id: CalorimeterHitImpl.java,v 1.3 2012/07/20 09:23:15 grefe Exp $

+ * @version $Id: CalorimeterHitImpl.java,v 1.4 2013/02/05 00:18:34 jeremy Exp $

  */
 public class CalorimeterHitImpl extends BaseCalorimeterHit
 {

@@ -24,7 +24,7 @@

      */
     public CalorimeterHitImpl(double energy, double energyError, double[] position, double time, long id, int type)
     {

-        this.corrEnergy = energy;

+        this.correctedEnergy = energy;

         this.energyError = energyError;
         this.positionVec = new BasicHep3Vector(position);
         this.time = time;

@@ -43,7 +43,7 @@

      */
     public CalorimeterHitImpl(double energy, double[] position, double time, long id, int type)
     {

-        this.corrEnergy = energy;

+        this.correctedEnergy = energy;

         this.positionVec = new BasicHep3Vector(position);
         this.time = time;
         this.id = id;

lcsim/src/org/lcsim/util/lcio

diff -u -r1.17 -r1.18
--- SIOCalorimeterHit.java	20 Jul 2012 09:23:15 -0000	1.17
+++ SIOCalorimeterHit.java	5 Feb 2013 00:18:34 -0000	1.18
@@ -13,7 +13,7 @@

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

- * @version $Id: SIOCalorimeterHit.java,v 1.17 2012/07/20 09:23:15 grefe Exp $

+ * @version $Id: SIOCalorimeterHit.java,v 1.18 2013/02/05 00:18:34 jeremy Exp $

  */
 class SIOCalorimeterHit extends BaseCalorimeterHit {
 

@@ -25,7 +25,7 @@

             cellid1 = in.readInt();
         }
         this.id = ((long) cellid1) << 32 | cellid0;

-        this.corrEnergy = in.readFloat();

+        this.correctedEnergy = in.readFloat();

         if (version >= 1051 && LCIOUtil.bitTest(flags, LCIOConstants.RCHBIT_ENERGY_ERROR)) {
             energyError = in.readFloat();
         }