diff -u -r1.1 -r1.2
--- QPhotonClusterEnergyCalculator.java	26 Mar 2008 16:40:20 -0000	1.1
+++ QPhotonClusterEnergyCalculator.java	27 Mar 2008 18:50:49 -0000	1.2
@@ -18,15 +18,15 @@

  */
 public class QPhotonClusterEnergyCalculator implements ClusterEnergyCalculator
 {

-    private ConditionsManager _mgr;

+    protected ConditionsManager _mgr;

     
     /** Creates a new instance of GenericClusterEnergyCalculator */
     String calibrationFilename = "photonQcal-v2r3p10";

-    double[] sf;

+    protected double[] sf;

     double[] Em;
     double[] Ec;

-    double alpha;
-    int nFrontLayersEcal;

+    protected double alpha;
+    protected int nFrontLayersEcal;

     public QPhotonClusterEnergyCalculator()
     {
     }

@@ -34,7 +34,7 @@

     {
         calibrationFilename = calFile;
     }

-    private void init()

+    protected void init()

     {
         _mgr =  ConditionsManager.defaultInstance();
         ConditionsSet cs = _mgr.getConditions("photonCalibration/"+calibrationFilename);

@@ -100,7 +100,7 @@

         double Emeas = linext(EmeasEst);
         return Emeas;
     }

-    private double linext(double Emeas)

+    protected double linext(double Emeas)

     {
         double E;
         if(Emeas <= Em[0])E = Emeas*Ec[0]/Em[0];

diff -u -r1.1 -r1.2
--- QNeutralHadronClusterEnergyCalculator.java	26 Mar 2008 16:40:20 -0000	1.1
+++ QNeutralHadronClusterEnergyCalculator.java	27 Mar 2008 18:50:49 -0000	1.2
@@ -15,15 +15,15 @@

  */
 public class QNeutralHadronClusterEnergyCalculator implements ClusterEnergyCalculator
 {

-    private ConditionsManager _mgr;

+    protected ConditionsManager _mgr;

     
     /** Creates a new instance of GenericClusterEnergyCalculator */

-    double alpha;

+    protected double alpha;

     String calibrationFilename = "nhQcal-v2r3p10";

-    double[] sf;

+    protected double[] sf;

     double[] Em;
     double[] Ec;

-    int nFrontLayersEcal;

+    protected int nFrontLayersEcal;

     public QNeutralHadronClusterEnergyCalculator()
     {
     }

@@ -31,7 +31,7 @@

     {
         calibrationFilename = calFile;
     }

-    private void init()

+    protected void init()

     {
         _mgr =  ConditionsManager.defaultInstance();
         ConditionsSet cs = _mgr.getConditions("hadronCalibration/"+calibrationFilename);

@@ -104,7 +104,7 @@

         double Emeas = linext(EmeasEst);
         return Emeas;
     }

-    private double linext(double Emeas)

+    protected double linext(double Emeas)

     {
         double E;
         if(Emeas <= Em[0])E = Emeas*Ec[0]/Em[0];