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

diff -u -r1.4 -r1.5
--- FixedConeClusterPropertyCalculator.java	16 Mar 2006 00:21:49 -0000	1.4
+++ FixedConeClusterPropertyCalculator.java	1 Jul 2006 21:58:37 -0000	1.5
@@ -39,9 +39,8 @@

      *
      * @param   decoder  The IDDecoder used for indexing
      */

-	public FixedConeClusterPropertyCalculator(IDDecoder decoder)

+	public FixedConeClusterPropertyCalculator()

 	{

-		_decoder = decoder;

 		layers = 64;
 	}
 	public void calculateProperties(List<CalorimeterHit> hits)

@@ -56,13 +55,9 @@

 
         for(CalorimeterHit h : hits )
         {

-		//	Subdetector d = hit.getSubdetector();
-		//	double _sampling_fraction = d.getSamplingFraction();
-			double _sampling_fraction = 1.;

+            _decoder = h.getIDDecoder();

 			_decoder.setID(h.getCellID());

-            // this is a change...
-            // incorporate sampling fractions to get correct cluster energy
-            double e = h.getRawEnergy()/_samplingFraction;

+            double e = h.getCorrectedEnergy();

             if (e>_highestCellEnergy)
             {
                 _highestCellEnergy = e;

@@ -136,15 +131,13 @@

 		for(int i=0;i<hits.size();i++)
 		{
 			CalorimeterHit hit = hits.get(i);

-		//	Subdetector d = hit.getSubdetector();
-		//	double sampling_fraction = d.getSamplingFraction();
-			double sampling_fraction = 1.;

 			double[] pos = new double[3];

+            _decoder = hit.getIDDecoder();

 			_decoder.setID(hit.getCellID());
 			pos[0] = _decoder.getX();
 			pos[1] = _decoder.getY();
 			pos[2] = _decoder.getZ();

-			double wt = hit.getRawEnergy()/sampling_fraction;

+			double wt = hit.getCorrectedEnergy();

 			wtsum += wt;
 			for(int j=0;j<3;j++)
 			{