diff -u -r1.6 -r1.7
--- ReclusterDriver.java	17 Jul 2008 04:11:24 -0000	1.6
+++ ReclusterDriver.java	20 Jul 2008 23:35:01 -0000	1.7
@@ -40,7 +40,7 @@

   * This version is superseded by ReclusterDTreeDriver,
   * which derives from it.
   *

-  * @version $Id: ReclusterDriver.java,v 1.6 2008/07/17 04:11:24 mcharles Exp $

+  * @version $Id: ReclusterDriver.java,v 1.7 2008/07/20 23:35:01 mcharles Exp $

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

@@ -56,6 +56,7 @@

 
     boolean m_useOldCalibration = false;
     boolean m_useAnalogHcalCalibration = false;

+    boolean m_useSteveMipsForChargedCalibration = true;

 
     boolean m_megaDebug = false;
     boolean m_debug = false;

@@ -148,7 +149,11 @@

 	} else {
 	    org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator newNeutralCalib = new org.lcsim.recon.pfa.structural.FuzzyQNeutralHadronClusterEnergyCalculator(m_useAnalogHcalCalibration);
 	    m_neutralCalib = newNeutralCalib;

-	    org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator("mips", newNeutralCalib);

+	    String mipListName = "mips";
+	    if (m_useSteveMipsForChargedCalibration) {
+		mipListName = "TMClusters";
+	    }
+	    org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator chargedCalibration = new org.lcsim.recon.pfa.structural.ChargedHadronClusterEnergyCalculator(mipListName, newNeutralCalib);

 	    m_chargedCalib = chargedCalibration;
 	    add(chargedCalibration);
 	    org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator newPhotonCalib = new org.lcsim.recon.pfa.structural.FuzzyQPhotonClusterEnergyCalculator();

@@ -3298,7 +3303,7 @@

 	}
     }
 

-    private class SteveMipWrapper extends Driver

+    protected class SteveMipWrapper extends Driver

     {
 	public SteveMipWrapper() 
 	{

diff -u -r1.7 -r1.8
--- ReclusterDTreeDriver.java	17 Jul 2008 04:33:02 -0000	1.7
+++ ReclusterDTreeDriver.java	20 Jul 2008 23:35:01 -0000	1.8
@@ -35,7 +35,7 @@

   * in this package, which uses the implementation in
   * org.lcsim.recon.cluster.directedtree developed by NIU).
   *

-  * @version $Id: ReclusterDTreeDriver.java,v 1.7 2008/07/17 04:33:02 mcharles Exp $

+  * @version $Id: ReclusterDTreeDriver.java,v 1.8 2008/07/20 23:35:01 mcharles Exp $

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

@@ -83,7 +83,7 @@

     protected boolean m_fixJetsWithCone = true;
 
     public ReclusterDTreeDriver(String dTreeClusterList, String trackList, String mcList) {

-	System.out.println("ReclusterDTreeDriver version 0.31");

+	System.out.println("ReclusterDTreeDriver version 0.32");

 	initTrackMatch();
 	initCalibration();
 	initPlots();

@@ -119,6 +119,12 @@

 	super.debugProcess(event);
 	m_event = event;
 

+	// Steve's pre-shower MIP-finder
+	{
+	    SteveMipWrapper tmpWrapper = new SteveMipWrapper();
+	    tmpWrapper.process(event);
+	}
+

 	if (m_oldMipFinderCrossesTrees) {
 	    m_allowComponentsToStraddleLargeClusters = true;
 	}