diff -u -r1.1 -r1.2
--- MuonFinder.java	22 Oct 2008 23:24:34 -0000	1.1
+++ MuonFinder.java	12 Nov 2008 08:01:33 -0000	1.2
@@ -31,7 +31,7 @@

  * it is required to find good quality mip cluster in muon detector.
  *
  * @author [log in to unmask]

- * @version $Id: MuonFinder.java,v 1.1 2008/10/22 23:24:34 mcharles Exp $

+ * @version $Id: MuonFinder.java,v 1.2 2008/11/12 08:01:33 tjkim Exp $

  */
 
 public class MuonFinder extends Driver{

@@ -45,15 +45,16 @@

     protected boolean _useFirstTwoLayer = true;
     EventHeader m_event;
 

-    protected HelixExtrapolator m_findCluster = new org.lcsim.recon.pfa.identifier.LocalHelixExtrapolator();

+    protected HelixExtrapolator _findCluster;

     protected boolean useMuonHitsForDebug = false;
 

-    public MuonFinder(String tracklist, String inCal, String inMu, String outMap, String outMapTrackToClusters){

+    public MuonFinder(HelixExtrapolator findCluster, String tracklist, String inCal, String inMu, String outMap, String outMapTrackToClusters){

         _inCal = inCal;
         _inMu = inMu;
         _outHitMap = outMap;
         _tracklist = tracklist;
 	_outMapTrackToClusters = outMapTrackToClusters;

+        _findCluster = findCluster;

         org.lcsim.contrib.uiowa.CalorimeterHitTimeCutDecision dec = new org.lcsim.contrib.uiowa.CalorimeterHitTimeCutDecision(100);
         add(new ListFilterDriver(dec, "MuonBarrHits", "CorrMuonBarrHits", CalorimeterHit.class));
         add(new ListFilterDriver(dec, "MuonEndcapHits", "CorrMuonEndcapHits", CalorimeterHit.class));

@@ -95,7 +96,7 @@

         for (CalorimeterHit allhit : calhits)  allHitIDs.add(allhit.getCellID());
     
 

-        m_findCluster.process(event); // picks up geometry

+        _findCluster.process(event); // picks up geometry

 
         List<Track> trackList = event.get(Track.class, _tracklist);
 

@@ -103,7 +104,7 @@

         //Mip in CAL has track matched
         //But Mip in Muon detector is standalone.
         //In the future, the muon Mip will be replace with standalone muon track.

-        MipTrackMap finder = new MipTrackMap(m_findCluster);

+        MipTrackMap finder = new MipTrackMap(_findCluster);

         Map<Track,BasicCluster> mipmap = finder.createCalMIPMap(calhits, trackList);
         List<Cluster> muonmips = finder.createMIPMuDet(mudethits);
 

@@ -168,7 +169,7 @@

                     double pT = Math.sqrt(track.x()*track.x() + track.y()*track.y());
                     double costheta = Math.abs(track.z()/p);
                                                                                                                               

-                    HelixExtrapolationResult result = m_findCluster.performExtrapolation(tr);

+                    HelixExtrapolationResult result = _findCluster.performExtrapolation(tr);

                     Cluster calmip = mipmap.get(tr);
                     Hep3Vector last = new BasicHep3Vector();
                     Hep3Vector lastUnit = new BasicHep3Vector();

diff -u -r1.2 -r1.3
--- MuonFinderWrapper.java	25 Oct 2008 00:48:44 -0000	1.2
+++ MuonFinderWrapper.java	12 Nov 2008 08:01:33 -0000	1.3
@@ -7,12 +7,13 @@

 import org.lcsim.recon.cluster.util.BasicCluster;
 import org.lcsim.recon.cluster.util.HitInMCALDecision;
 import org.lcsim.util.hitmap.HitMap;

+import org.lcsim.recon.pfa.identifier.*;

 
 /**
  * Wrapper class for MuonFinder.
  *
  * @author [log in to unmask]

- * @version $Id: MuonFinderWrapper.java,v 1.2 2008/10/25 00:48:44 mcharles Exp $

+ * @version $Id: MuonFinderWrapper.java,v 1.3 2008/11/12 08:01:33 tjkim Exp $

  */
 
 public class MuonFinderWrapper extends Driver {

@@ -20,6 +21,7 @@

     // Inputs
     protected String m_trackList;
     protected String m_inHitMap;

+    protected HelixExtrapolator m_findCluster;

     
     // Outputs
     protected String m_outMuonTrackClusterMap;

@@ -36,9 +38,10 @@

     protected boolean m_debugSkip = false;
     public void skip() { m_debugSkip = true; }
 

-    public MuonFinderWrapper(String inTrackList, String inHitMap, String outMuonTrackClusterMap,  String outHitMap, String outTrackList) 

+    public MuonFinderWrapper(HelixExtrapolator findCluster,String inTrackList, String inHitMap, String outMuonTrackClusterMap,  String outHitMap, String outTrackList) 

     {
 	// Inputs/outputs

+        m_findCluster = findCluster;

 	m_trackList = inTrackList;
 	m_inHitMap = inHitMap;
 	m_outMuonTrackClusterMap = outMuonTrackClusterMap;

@@ -82,7 +85,7 @@

 	    outTrackList = inTrackList;
 	} else {
 	    // Call old process routine to do the work

-	    MuonFinder tmpWrappedMuonFinder = new MuonFinder(m_trackList, _inCal, _inMu, _outHitMap, _outMapTrackToClusters);

+	    MuonFinder tmpWrappedMuonFinder = new MuonFinder(m_findCluster, m_trackList, _inCal, _inMu, _outHitMap, _outMapTrackToClusters);

 	    tmpWrappedMuonFinder.process(event);
 	    outMuonTrackClusterMap = (Map<Track,Cluster>)(event.get(_outMapTrackToClusters));