diff -u -r1.18 -r1.19
--- ReclusterDriver.java	26 Mar 2008 19:45:31 -0000	1.18
+++ ReclusterDriver.java	27 Mar 2008 18:21:12 -0000	1.19
@@ -20,6 +20,11 @@

 import org.lcsim.recon.cluster.structural.*;
 import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
 import org.lcsim.geometry.Detector;

+import org.lcsim.recon.pfa.structural.FuzzyCalorimeterHit;
+import org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator;
+import org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator;
+import org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator;
+import org.lcsim.recon.pfa.structural.FuzzyNeutralHadronClusterEnergyCalculator;

 
 /**
   * An algorithm to recluster showers using E/p information

@@ -32,7 +37,7 @@

   *
   * This version is PRELIMINARY.
   *

-  * @version $Id: ReclusterDriver.java,v 1.18 2008/03/26 19:45:31 mcharles Exp $

+  * @version $Id: ReclusterDriver.java,v 1.19 2008/03/27 18:21:12 mcharles Exp $

   * @author Mat Charles
   */
 

@@ -46,6 +51,8 @@

 	m_debugEoverP = debug;
     }
 

+    boolean m_useOldCalibration = false;
+

     boolean m_megaDebug = false;
     boolean m_debug = false;
     boolean m_debugTiming = false;

@@ -72,6 +79,7 @@

     }
 
     public ReclusterDriver(String mcList, String trackList, String muonParticles, String photonClusters, String skeletonClusters, String smallClusters, String unusedHits, String largeClusters, String mips, String clumps, String splitSkeletonClusters, LikelihoodEvaluator eval) {

+	System.out.println("ReclusterDriver version 0.1 -- DEPRECATED");

 	m_eval = eval;
 	m_mcList = mcList;
 	m_inputTrackList = trackList;

@@ -118,14 +126,24 @@

 
     protected void initCalibration() {
 	// Calibration

-	FuzzyNeutralHadronClusterEnergyCalculator neutralCalib = new FuzzyNeutralHadronClusterEnergyCalculator();
-	neutralCalib.setMinimumAllowedEnergy(0.0);
-	m_neutralCalib = neutralCalib;
-	ChargedHadronClusterEnergyCalculator chargedCalibration = new ChargedHadronClusterEnergyCalculator("mips", neutralCalib);
-	m_chargedCalib = chargedCalibration;
-	add(chargedCalibration);
-	FuzzyPhotonClusterEnergyCalculator photonCalib = new FuzzyPhotonClusterEnergyCalculator();
-	m_photonCalib = photonCalib;

+	if (m_useOldCalibration) {
+	    org.lcsim.recon.pfa.structural.FuzzyNeutralHadronClusterEnergyCalculator neutralCalib = new org.lcsim.recon.pfa.structural.FuzzyNeutralHadronClusterEnergyCalculator();
+	    neutralCalib.setMinimumAllowedEnergy(0.0);
+	    m_neutralCalib = neutralCalib;
+	    org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", neutralCalib);
+	    m_chargedCalib = chargedCalibration;
+	    add(chargedCalibration);
+	    org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator photonCalib = new org.lcsim.recon.pfa.structural.FuzzyPhotonClusterEnergyCalculator();
+	    m_photonCalib = photonCalib;
+	} else {
+	    org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator newNeutralCalib = new org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator();
+	    m_neutralCalib = newNeutralCalib;
+	    org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", newNeutralCalib);
+	    m_chargedCalib = chargedCalibration;
+	    add(chargedCalibration);
+	    org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator newPhotonCalib = new org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator();
+	    m_photonCalib = newPhotonCalib;
+	}

     }
 
     protected void debugProcess(EventHeader event) {