diff -u -r1.1 -r1.2
--- FlexibleMIPFinder.java	18 Oct 2007 03:08:41 -0000	1.1
+++ FlexibleMIPFinder.java	18 Oct 2007 17:05:19 -0000	1.2
@@ -22,7 +22,7 @@

  * and have 1 or 2 other hits within a 5x5x3 grid
  *
  * @author Mat Charles

- * @version $Id: FlexibleMIPFinder.java,v 1.1 2007/10/18 03:08:41 mcharles Exp $

+ * @version $Id: FlexibleMIPFinder.java,v 1.2 2007/10/18 17:05:19 mcharles Exp $

  */
 
 public class FlexibleMIPFinder extends Driver

@@ -190,24 +190,6 @@

 	    }
 	}
 

-	List<CalorimeterHit> listOfSingleHitsForEvent = new Vector<CalorimeterHit>();
-	List<CalorimeterHit> listOfDoubleHitsForEvent = new Vector<CalorimeterHit>();
-	listOfSingleHitsForEvent.addAll(allLocallyIsolatedHits_12);
-	listOfDoubleHitsForEvent.addAll(allLocallyIsolatedHits_3);
-	String singleName = m_inputHitMapName + "SingleHits";
-	String doubleName = m_inputHitMapName + "DoubleHits";
-	String isolatedName = m_inputHitMapName + "IsolatedHits";
-	String busyName = m_inputHitMapName + "BusyHits";
-	event.put(singleName, listOfSingleHitsForEvent);
-	event.put(doubleName, listOfDoubleHitsForEvent);
-	event.put(isolatedName, listOfIsolatedHitsForEvent);
-	event.put(busyName, listOfBusyHitsForEvent);
-
-	List<CalorimeterHit> listOfHitsWithWideWindow = new Vector<CalorimeterHit>();
-	listOfHitsWithWideWindow.addAll(cacheNeighboursOfHitsThatNeedWideWindow.keySet());
-	String wideName = m_inputHitMapName + "WideHits";
-	event.put(wideName, listOfHitsWithWideWindow);
-

 	// OK. Now we try to build the MIPs.
 	// We need to avoid forking. Do this with 2+1 rules:
 	//

@@ -245,11 +227,20 @@

 			newCluster.addHit(hit);
 		    }
 		    outputList.add(newCluster);

-		} else {

 		}
 	    }
 	}
 

+	// Make the output hit list listing unused hits
+	HitMap outputHitMap = new HitMap(inputHitMap); // initially cloned
+	for (Cluster clus : outputList) {
+	    for (CalorimeterHit hit : clus.getCalorimeterHits()) {
+		outputHitMap.remove(hit.getCellID());
+	    }
+	}
+	// Write out hit list
+	event.put(m_outputHitMapName, outputHitMap);
+

 	// OK, done.
 	event.put(m_outputClusterListName, outputList);
     }