Print

Print


Commit in lcsim/src/org/lcsim/contrib/uiowa on MAIN
ReclusterDriver.java+9-41.41 -> 1.42
MJC: (contrib) Supply helix extrapolator as an argument rather than hard-coding

lcsim/src/org/lcsim/contrib/uiowa
ReclusterDriver.java 1.41 -> 1.42
diff -u -r1.41 -r1.42
--- ReclusterDriver.java	29 Sep 2008 20:35:56 -0000	1.41
+++ ReclusterDriver.java	13 Oct 2008 06:33:13 -0000	1.42
@@ -39,7 +39,7 @@
   *
   * This version is PRELIMINARY.
   *
-  * @version $Id: ReclusterDriver.java,v 1.41 2008/09/29 20:35:56 mcharles Exp $
+  * @version $Id: ReclusterDriver.java,v 1.42 2008/10/13 06:33:13 mcharles Exp $
   * @author Mat Charles
   */
 
@@ -90,7 +90,8 @@
 
     protected boolean m_debugLinkPlots = false;
 
-    protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.LocalHelixExtrapolator();
+    protected HelixExtrapolator m_findCluster = null;
+    //protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.LocalHelixExtrapolator();
     //protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.TrackHelixExtrapolator();
     //protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.TrackHelixPlusHitExtrapolator();
 
@@ -115,7 +116,7 @@
 	m_inputClumps = clumps;
 	m_inputSplitSkeletonClusters = splitSkeletonClusters;
 
-	initTrackMatch();
+	initTrackMatch(new org.lcsim.recon.pfa.identifier.TrackHelixPlusHitExtrapolator());
 	initCalibration();
 	initPlots();
 
@@ -125,8 +126,12 @@
 	}
     }
 
-    protected void initTrackMatch() {
+    protected void initTrackMatch(HelixExtrapolator findCluster) {
 	// Track-matching is complex. Use several matchers...
+
+	// Set the extrapolation routine:
+	m_findCluster = findCluster;
+
 	// Try matching with local helix extrap to MIP or generic cluster:
 	LocalHelixExtrapolationTrackMIPClusterMatcher mipMatch = new LocalHelixExtrapolationTrackMIPClusterMatcher(m_findCluster);
 	LocalHelixExtrapolationTrackClusterMatcher genMatch = new LocalHelixExtrapolationTrackClusterMatcher(m_findCluster);
CVSspam 0.2.8