lcsim/src/org/lcsim/recon/pfa/structural

diff -u -r1.1 -r1.2
--- FuzzyQNeutralHadronClusterEnergyCalculator.java	27 Mar 2008 18:15:28 -0000	1.1
+++ FuzzyQNeutralHadronClusterEnergyCalculator.java	1 Apr 2008 01:47:59 -0000	1.2
@@ -14,7 +14,7 @@

   * an extension of Ron's QNeutralHadronClusterEnergyCalculator
   * class.
   * 

-  * @version $Id: FuzzyQNeutralHadronClusterEnergyCalculator.java,v 1.1 2008/03/27 18:15:28 mcharles Exp $

+  * @version $Id: FuzzyQNeutralHadronClusterEnergyCalculator.java,v 1.2 2008/04/01 01:47:59 mcharles Exp $

   */
 
 public class FuzzyQNeutralHadronClusterEnergyCalculator extends QNeutralHadronClusterEnergyCalculator

@@ -24,6 +24,14 @@

         super();
     }
 

+    public FuzzyQNeutralHadronClusterEnergyCalculator(boolean analog) {
+        super(analog);
+    }
+
+    public FuzzyQNeutralHadronClusterEnergyCalculator(String calFile, boolean analog) {
+	super(calFile, analog);
+    }
+

     /** Find the energy of this cluster. */
     public double getEnergy(Cluster c)
     {

@@ -72,18 +80,22 @@

             }
             else if(detector_index == 3)
             {

+		double Ehit = 1.0;
+                if (analogHcal) { Ehit = hit.getRawEnergy(); }

                 double[] pos = hit.getPosition();
                 double R = Math.sqrt(pos[0]*pos[0]+pos[1]*pos[1]+pos[2]*pos[2]);
                 double ctheta = Math.abs(pos[2])/R;
                 double st = Math.sqrt(1.-ctheta*ctheta);

-                EmeasEst += hitWeight * ((1./(1. + alpha*(1./st - 1.)))/sf[4]);

+                EmeasEst += hitWeight * ((Ehit/(1. + alpha*(1./st - 1.)))/sf[4]);

             }
             else if(detector_index == 7)
             {

+		double Ehit = 1.0;
+                if (analogHcal) { Ehit = hit.getRawEnergy(); }

                 double[] pos = hit.getPosition();
                 double R = Math.sqrt(pos[0]*pos[0]+pos[1]*pos[1]+pos[2]*pos[2]);
                 double st = Math.abs(pos[2])/R;

-                EmeasEst += hitWeight * ((1./(1. + alpha*(1./st - 1.)))/sf[5]);

+                EmeasEst += hitWeight * ((Ehit/(1. + alpha*(1./st - 1.)))/sf[5]);

             }
         }
 //