diff -u -r1.2 -r1.3
--- Remapper.java	1 Oct 2005 02:06:13 -0000	1.2
+++ Remapper.java	14 Oct 2005 17:49:45 -0000	1.3
@@ -3,6 +3,7 @@

 import java.lang.String;
 import java.util.List;
 import java.util.Map;

+import java.util.Set;

 import java.util.HashMap;
 import java.util.Vector;
 import org.lcsim.event.EventHeader;

@@ -68,16 +69,36 @@

 			tracksMappedToThisBigCluster.addAll(tracksMatchedToThisSubCluster);
 		    } else {
 			// Not found

-			System.out.println("DEBUG: Didn't find subcluster "+subCluster+" inside any of the big clusters.");

+                        if (m_debug) {
+			  System.out.println("WARNING: Didn't find subcluster "+subCluster+" inside any of the big clusters.");
+                        }

 		    }
 		}
 	    }
 	}

-	// Dummy...

+	// Dummy for writeout

 	List<Map<Cluster, List<Cluster>>> dummyList = new Vector<Map<Cluster, List<Cluster> > > ();
 	dummyList.add(mapClustersToTracks);
 	event.put(m_mapName, dummyList);
 

+        if (m_debug) {
+	  // Debug printout
+	  int debugNumBigClusters = 0;
+	  int debugNumSmallClusters = 0;
+	  int debugNumMIPs = 0;
+	  int debugNumClumps = 0;
+	  Set<Cluster> debugBigClusters = mapClustersToTracks.keySet();
+	  for (Cluster currentBigCluster : debugBigClusters) {
+	      debugNumBigClusters++;
+	      List<Cluster> mappedTracks = mapClustersToTracks.get(currentBigCluster);
+	      debugNumMIPs += mappedTracks.size();
+	      debugNumSmallClusters += currentBigCluster.getClusters().size();
+  	  }
+	  System.out.println("DEBUG: "+this.getClass().getName()+": Mapped "+debugNumBigClusters+" big clusters (out of "+bigClusters.size()+") to "+debugNumSmallClusters+" small clusters and "+debugNumMIPs+" MIPs");
+        }

     }

+
+  protected boolean m_debug = false;
+  void setDebug(boolean debug) { m_debug = debug; }

 }