diff -u -r1.1 -r1.2
--- NonTrivialPFA.java	16 Jan 2008 21:12:14 -0000	1.1
+++ NonTrivialPFA.java	3 Apr 2008 00:46:23 -0000	1.2
@@ -29,7 +29,7 @@

  * a List<ReconstructedParticle>, written to the event as
  * PFAReconstructedParticles.
  *

- * @version $Id: NonTrivialPFA.java,v 1.1 2008/01/16 21:12:14 mcharles Exp $

+ * @version $Id: NonTrivialPFA.java,v 1.2 2008/04/03 00:46:23 mcharles Exp $

  * @author Mat Charles <[log in to unmask]>
  */
 

@@ -42,6 +42,7 @@

 	this(false);
     }
 

+    boolean m_useOldCalibration = false;

     boolean m_writeLikelihood = false;
     String m_writeLikelihoodFilename = "likelihood.bin";
     String m_outputReconstructedParticleListName = "PFAReconstructedParticles";

@@ -65,15 +66,18 @@

 	// -----------
 
 	// Ron's calibrations

-	PhotonClusterEnergyCalculator ronPhotonCalib = new PhotonClusterEnergyCalculator();
-	GenericClusterEnergyCalculator ronGenericCalib = new GenericClusterEnergyCalculator();
-	DetailedNeutralHadronClusterEnergyCalculator ronNeutralHadronCalib = new DetailedNeutralHadronClusterEnergyCalculator();
-	DetailedNeutralHadronClusterEnergyCalculator ronChargedHadronCalib = new DetailedNeutralHadronClusterEnergyCalculator();
-	// Alternatively, there's a modified version in the org.lcsim.contrib.uiowa
-	// package that could be used:
-	//ModifiedDetailedNeutralHadronClusterEnergyCalculator ronChargedHadronCalib = new ModifiedDetailedNeutralHadronClusterEnergyCalculator();
-	//ronChargedHadronCalib.setMinimumEnergy(0.0);
-	//ronChargedHadronCalib.setDoInversion(false);

+	ClusterEnergyCalculator ronPhotonCalib = null;	
+	ClusterEnergyCalculator ronNeutralHadronCalib = null;
+	ClusterEnergyCalculator ronChargedHadronCalib = null;
+	if (m_useOldCalibration) {
+	    ronPhotonCalib = new PhotonClusterEnergyCalculator();
+	    ronNeutralHadronCalib = new DetailedNeutralHadronClusterEnergyCalculator();
+	    ronChargedHadronCalib = new DetailedNeutralHadronClusterEnergyCalculator();
+	} else {
+	    ronPhotonCalib = new QPhotonClusterEnergyCalculator();
+	    ronNeutralHadronCalib = new QNeutralHadronClusterEnergyCalculator();
+	    ronChargedHadronCalib = new QNeutralHadronClusterEnergyCalculator();
+	}

 
 	// Set up the MC lists
 	// -------------------