diff -u -r1.1 -r1.2
--- MuonFinderWrapper.java	13 Oct 2008 06:35:31 -0000	1.1
+++ MuonFinderWrapper.java	15 Oct 2008 00:52:30 -0000	1.2
@@ -20,9 +20,8 @@

     protected String m_outTrackList;
 
     // Old/temporary

-    protected String _outName;

     protected String _outHitMap;

-    protected String _outMapTrackToSetOfClusters;

+    protected String _outMapTrackToClusters;

     protected String _inMu;
     protected String _inCal;
 

@@ -42,8 +41,7 @@

 	_inCal = new String("tmpCal");
 	_inMu = new String("tmpMu");
 	_outHitMap = new String("tmpMap");

-	_outMapTrackToSetOfClusters = new String("tmpMap2");
-	_outName = new String("tmpName");

+	_outMapTrackToClusters = new String("tmpMap2");

     }
 
     public void process(EventHeader event) {

@@ -77,21 +75,9 @@

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

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

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

 	    tmpWrappedMuonFinder.process(event);

-	    Map<Track,Set<Cluster>> oldMap = (Map<Track,Set<Cluster>>)(event.get(_outMapTrackToSetOfClusters));
-
-	    // Make output muon track -> cluster map
-	    for (Track tr : oldMap.keySet()) {
-		Set<Cluster> clustersOfMuon = oldMap.get(tr);
-		BasicCluster combinedClus = new BasicCluster();
-		for (Cluster clus : clustersOfMuon) {
-		    for (CalorimeterHit hit : clus.getCalorimeterHits()) {
-			combinedClus.addHit(hit);
-		    }
-		}
-		outMuonTrackClusterMap.put(tr, combinedClus);
-	    }

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

 
 	    // Make HitMap of remaining hits:
 	    for (Cluster muonClus : outMuonTrackClusterMap.values()) {