diff -u -r1.38 -r1.39
--- ReclusterDriver.java	6 Sep 2008 23:48:43 -0000	1.38
+++ ReclusterDriver.java	9 Sep 2008 22:33:30 -0000	1.39
@@ -38,7 +38,7 @@

   *
   * This version is PRELIMINARY.
   *

-  * @version $Id: ReclusterDriver.java,v 1.38 2008/09/06 23:48:43 mcharles Exp $

+  * @version $Id: ReclusterDriver.java,v 1.39 2008/09/09 22:33:30 mcharles Exp $

   * @author Mat Charles
   */
 

@@ -92,6 +92,8 @@

     //protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.TrackHelixExtrapolator();
     //protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.TrackHelixPlusHitExtrapolator();
 

+    boolean m_useBackupTrackMatching = false;
+

     protected ReclusterDriver() {
 	// Gah, debug only!
     }

@@ -129,18 +131,20 @@

 	DualActionTrackClusterMatcher localHelixMatchers = new DualActionTrackClusterMatcher(mipMatch, genMatch);
 	add(mipMatch);
 	add(genMatch);

-	System.out.println("FIXME: Disabled backup tracking for testing purposes!");
-	// Try matching with full swimming to MIP or generic cluster:
-	SimpleTrackMIPClusterMatcher mipMatchSimple = new SimpleTrackMIPClusterMatcher();
-	SimpleTrackClusterMatcher genMatchSimple = new SimpleTrackClusterMatcher();
-	DualActionTrackClusterMatcher simpleMatchers = new DualActionTrackClusterMatcher(mipMatchSimple, genMatchSimple);
-	add(mipMatchSimple);
-	add(genMatchSimple);
-	// Combine:
-	SequentialTrackClusterMatcher combinedTrackClusterMatcher = new SequentialTrackClusterMatcher();
-	combinedTrackClusterMatcher.addMatcher(localHelixMatchers);
-	combinedTrackClusterMatcher.addMatcher(simpleMatchers);
-	m_trackClusterMatcher = combinedTrackClusterMatcher;

+	m_trackClusterMatcher = localHelixMatchers;
+	if (m_useBackupTrackMatching) {
+	    // Try matching with full swimming to MIP or generic cluster:
+	    SimpleTrackMIPClusterMatcher mipMatchSimple = new SimpleTrackMIPClusterMatcher();
+	    SimpleTrackClusterMatcher genMatchSimple = new SimpleTrackClusterMatcher();
+	    DualActionTrackClusterMatcher simpleMatchers = new DualActionTrackClusterMatcher(mipMatchSimple, genMatchSimple);
+	    add(mipMatchSimple);
+	    add(genMatchSimple);
+	    // Combine:
+	    SequentialTrackClusterMatcher combinedTrackClusterMatcher = new SequentialTrackClusterMatcher();
+	    combinedTrackClusterMatcher.addMatcher(localHelixMatchers);
+	    combinedTrackClusterMatcher.addMatcher(simpleMatchers);
+	    m_trackClusterMatcher = combinedTrackClusterMatcher;
+	}

     }
 
     protected void initCalibration() {