diff -u -r1.3 -r1.4
--- ReclusterDriver.java	16 Oct 2007 01:40:11 -0000	1.3
+++ ReclusterDriver.java	10 Nov 2007 02:10:11 -0000	1.4
@@ -19,6 +19,8 @@

 
 public class ReclusterDriver extends Driver {
 

+    boolean m_megaDebug = false;
+    boolean m_debug = true;

     String m_outputParticleListName = "ReclusteredParticles";
     String m_mcList;
     String m_inputSmallClusters;

@@ -118,7 +120,7 @@

 	    System.out.println("DEBUG: ReclusterDriver read in "+smallClusters.size()+" small clusters comprising "+countSmallClusterHits+" hits.");
 	}
 	

-	// Many of those LargeClusters contain skeleton(s), but a few may not. Identify them.

+	// Many of those LargeClusters [and some of the small clusters] contain skeleton(s), but a few may not. Identify them.

 	List<Cluster> largeClustersWithoutSkeletons = new Vector<Cluster>();
 	for (Cluster largeCluster : largeClusters) {
 	    List<CalorimeterHit> largeClusterHits = largeCluster.getCalorimeterHits();

@@ -136,6 +138,32 @@

 		largeClustersWithoutSkeletons.add(largeCluster);
 	    }
 	}

+	List<Cluster> smallClustersWithoutSkeletons = new Vector<Cluster>();
+	for (Cluster smallCluster : smallClusters) {
+	    List<CalorimeterHit> smallClusterHits = smallCluster.getCalorimeterHits();
+	    boolean smallClusterContainsSkeleton = false;
+	    for (Cluster mip : mips) {
+		if (smallClusterContainsSkeleton) { break; }
+		for (CalorimeterHit hit : mip.getCalorimeterHits()) {
+		    if (smallClusterHits.contains(hit)) {
+			smallClusterContainsSkeleton = true;
+			break;
+		    }
+		}
+	    }
+	    for (Cluster clump : clumps) {
+		if (smallClusterContainsSkeleton) { break; }
+		for (CalorimeterHit hit : clump.getCalorimeterHits()) {
+		    if (smallClusterHits.contains(hit)) {
+			smallClusterContainsSkeleton = true;
+			break;
+		    }
+		}
+	    }
+	    if (!smallClusterContainsSkeleton) {
+		smallClustersWithoutSkeletons.add(smallCluster);
+	    }
+	}

 
 	{
 	    int countLargeHitsUnused = 0;

@@ -171,15 +199,24 @@

 	mixedClusters.addAll(clumps);
 	mixedClusters.addAll(largeClustersWithoutSkeletons);
 	mixedClusters.addAll(photonClusters); // could match [electrons]

-	mixedClusters.addAll(smallClusters);

+	List<Cluster> mixedClustersAndHits = new Vector<Cluster>(mixedClusters);
+	mixedClustersAndHits.addAll(smallClustersWithoutSkeletons);

 	Map<Track,Cluster> tracksMatchedToClusters = new HashMap<Track,Cluster>();
 	Map<Cluster, List<Track>> clustersMatchedToTracks = new HashMap<Cluster, List<Track>>();
 	for (Track tr : trackList) {

+	    // First try excluding the small clusters, which are often just single hits:

 	    Cluster matchedCluster = m_trackClusterMatcher.matchTrackToCluster(tr, mixedClusters);

+	    if (matchedCluster == null) {
+		// Now retry with all:
+		matchedCluster = m_trackClusterMatcher.matchTrackToCluster(tr, mixedClustersAndHits);
+	    }

 	    if (matchedCluster != null) {
 		tracksMatchedToClusters.put(tr, matchedCluster);
 		List<Track> clusTrList = clustersMatchedToTracks.get(matchedCluster);

-		if (clusTrList == null) { clusTrList = new Vector<Track>(); clustersMatchedToTracks.put(matchedCluster, clusTrList); }

+		if (clusTrList == null) { 
+		    clusTrList = new Vector<Track>(); 
+		    clustersMatchedToTracks.put(matchedCluster, clusTrList); 
+		}

 		clusTrList.add(tr);
 	    }
 	}

@@ -191,7 +228,31 @@

 	unmatchedTracks.removeAll(tracksMatchedToClusters.keySet());
 
 	// Some debug printout

-	System.out.println("DEBUG: "+unmatchedTracks.size()+" unmatched tracks remaining.");

+	System.out.println("DEBUG: "+unmatchedTracks.size()+" unmatched tracks remaining:");
+	for (Track tr : unmatchedTracks) {
+	    Hep3Vector p = new BasicHep3Vector(tr.getMomentum());
+	    double px = p.x();
+	    double py = p.y();
+	    double pz = p.z();
+	    double pmag = p.magnitude();
+	    double pt = Math.sqrt(px*px + py*py);
+	    double cosTheta = pz/pmag;
+	    String printme = new String("Track with p="+p.magnitude()+" (cosTheta="+cosTheta+")");
+	    LocalHelixExtrapolationTrackClusterMatcher extrap = new LocalHelixExtrapolationTrackClusterMatcher();
+	    extrap.process(m_event);
+	    Hep3Vector point = extrap.performExtrapolation(tr);
+	    if (point == null) {
+		printme += " -- extrapolation point is null";
+	    } else {
+		double x = point.x();
+		double y = point.y();
+		double z = point.z();
+		double r = Math.sqrt(x*x + y*y);
+		printme += " -- extrapolation point at x="+point.x()+", y="+point.y()+", z="+point.z()+", r="+r;
+	    }
+	    System.out.println(printme);
+	}
+

 	System.out.println("DEBUG: Here are the "+tracksMatchedToClusters.keySet().size()+" matched tracks");
 	for (Track tr : tracksMatchedToClusters.keySet()) {
 	    Cluster clus = tracksMatchedToClusters.get(tr);

@@ -218,7 +279,7 @@

 	    if (clumps.contains(clus)) { printme += " [from CLUMPS]"; }
 	    if (largeClustersWithoutSkeletons.contains(clus)) { printme += " [from LARGE CLUSTERS W/O SKELETONS]"; }
 	    if (photonClusters.contains(clus)) { printme += " [from PHOTONS]"; }

-	    if (smallClusters.contains(clus)) { printme += " [from SMALL CLUSTERS]"; }

+	    if (smallClustersWithoutSkeletons.contains(clus)) { printme += " [from SMALL CLUSTERS]"; }

 	    Map<MCParticle, List<CalorimeterHit>> clusterTruth = new HashMap<MCParticle, List<CalorimeterHit>>();
 	    for (CalorimeterHit hit : clus.getCalorimeterHits()) {
 		SimCalorimeterHit simHit = (SimCalorimeterHit)(hit);

@@ -237,6 +298,22 @@

 		}
 	    }
 	    printme += " (dominant particle: "+maxParticle.getType().getPDGID()+" with "+clusterTruth.get(maxParticle).size()+" hits)";

+
+	    // DEBUG
+	    LocalHelixExtrapolationTrackClusterMatcher extrap = new LocalHelixExtrapolationTrackClusterMatcher();
+	    extrap.process(m_event);
+	    Hep3Vector point = extrap.performExtrapolation(tr);
+	    printme += " -- extrap point is ";
+	    if (point == null) {
+		printme += "null";
+	    } else {
+		double x = point.x();
+		double y = point.y();
+		double z = point.z();
+		double r = Math.sqrt(x*x + y*y);
+		printme += "r="+r+", z="+z;
+	    }
+

 	    System.out.println(printme);
 	}
 

@@ -256,6 +333,211 @@

 	    seedClusterTrackEnergy.put(seed, new Double(energySum));
 	}