lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.1 -r1.2
--- DetailedNeutralHadronClusterEnergyCalculator.java	29 Sep 2006 14:12:32 -0000	1.1
+++ DetailedNeutralHadronClusterEnergyCalculator.java	23 Mar 2007 18:15:47 -0000	1.2
@@ -65,6 +65,8 @@

     double EM2ECDtoAcut;
     public DetailedNeutralHadronClusterEnergyCalculator()
     {

+    }
+    private void init() {

 //
 // Get the calibration constants
 //

@@ -123,6 +125,10 @@

     }
     public double getEnergy(Cluster c)
     {

+	if (_mgr==null) {
+	    init();
+	}
+

         double EmeasEst = 0.;
 //
 // First get the sums for each subdetector

lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.1 -r1.2
--- GenericClusterEnergyCalculator.java	29 Sep 2006 14:12:32 -0000	1.1
+++ GenericClusterEnergyCalculator.java	23 Mar 2007 18:15:47 -0000	1.2
@@ -27,6 +27,8 @@

     /** Creates a new instance of GenericClusterEnergyCalculator */
     public GenericClusterEnergyCalculator()
     {

+    }
+    private void init() {

         _mgr =  ConditionsManager.defaultInstance();
         ConditionsSet cs = _mgr.getConditions("photonCalibration/ZpoleInversion");
         Ecut = cs.getDoubleArray("hitEcut");

@@ -34,6 +36,9 @@

     }
     public double getEnergy(Cluster c)
     {

+	if (_mgr == null) {
+	    init();
+	}

         double EmeasEst = 0.;
         for(CalorimeterHit hit:c.getCalorimeterHits())
         {

lcsim/src/org/lcsim/recon/cluster/util

diff -u -r1.1 -r1.2
--- PhotonClusterEnergyCalculator.java	29 Sep 2006 14:12:32 -0000	1.1
+++ PhotonClusterEnergyCalculator.java	23 Mar 2007 18:15:47 -0000	1.2
@@ -29,6 +29,8 @@

     /** Creates a new instance of PhotonClusterEnergyCalculator */
     public PhotonClusterEnergyCalculator()
     {

+    }
+    private void init() {

         _mgr =  ConditionsManager.defaultInstance();
         ConditionsSet cs = _mgr.getConditions("photonCalibration/ZpoleInversion");
         hitEcut = cs.getDoubleArray("hitEcut");

@@ -36,9 +38,13 @@

         gparms = cs.getDoubleArray("parameters");
         norm = cs.getDouble("normalization");
         angcoef = cs.getDouble("angleCoef");

-    }

+    }	

     public double getEnergy(Cluster c)
     {

+	if (_mgr == null) {
+	    init();
+	}
+

         double Energy = 0.;
         double[] pos = c.getPosition();
         double rsq = pos[0]*pos[0] + pos[1]*pos[1];