diff -u -r1.48 -r1.49
--- ReclusterDTreeDriver.java	6 Sep 2008 23:48:43 -0000	1.48
+++ ReclusterDTreeDriver.java	9 Sep 2008 22:35:50 -0000	1.49
@@ -35,7 +35,7 @@

   * in this package, which uses the implementation in
   * org.lcsim.recon.cluster.directedtree developed by NIU).
   *

-  * @version $Id: ReclusterDTreeDriver.java,v 1.48 2008/09/06 23:48:43 mcharles Exp $

+  * @version $Id: ReclusterDTreeDriver.java,v 1.49 2008/09/09 22:35:50 mcharles Exp $

   * @author Mat Charles <[log in to unmask]>
   */
 

@@ -86,7 +86,7 @@

     protected boolean m_fixSingleTracksWithCone = true;
     protected boolean m_fixJetsWithCone = true;
     protected boolean m_useSimpleConeForReassignment = false;

-    protected double  m_minScoreForReassignment = 0.1;

+    protected double  m_minScoreForReassignment = 0.7;

 
     protected boolean m_debugSeedSplitting = false;
 

@@ -1345,31 +1345,6 @@

 	    boolean passesEoverPafter = testEoverP_twoSided(energyAfter, trackMomentum, tolerance);
 	    boolean passesEoverPafterTight = testEoverP_twoSided(energyAfter, trackMomentum, 1.0);
 	    boolean punchThrough = isPunchThrough(initialClustersPlusAdditions, allSharedClusters);  

-	    {
-		// Temp debug stuff
-		if (passesEoverPafter || (!passesEoverPafter && energyAfter < trackMomentum)) {
-		    double tmpScore = getBestScore(initialShower, value);
-		    double trackMassSq = 0.140 * 0.140;
-		    double trackMomentumSq = trackMomentum * trackMomentum;
-		    double trackEnergySq = trackMomentumSq + trackMassSq;
-		    double trackEnergy = Math.sqrt(trackEnergySq);
-		    double trackEnergySigma = estimatedEnergyUncertainty(trackMomentum);
-		    double normalisedResidualBefore = (energyBefore - trackEnergy)/trackEnergySigma;
-		    double normalisedResidualAfter = (energyAfter - trackEnergy)/trackEnergySigma;
-		    System.out.print("DEBUG: Score "+tmpScore+" for norm residual of "+normalisedResidualBefore+" -> "+normalisedResidualAfter);
-		    List<MCParticle> trackTruth = getMCParticle(jet);
-		    MCParticle clusTruth = quoteDominantParticle(value);
-		    if (trackTruth.contains(clusTruth)) {
-			System.out.println("  -- good match!");
-			AIDA.defaultInstance().cloud2D("ScoreVsNormResidBeforePassTruthMatch").fill(normalisedResidualBefore, tmpScore);
-			AIDA.defaultInstance().cloud2D("ScoreVsNormResidAfterPassTruthMatch").fill(normalisedResidualAfter, tmpScore);
-		    } else {
-			System.out.println("  -- bad match");
-			AIDA.defaultInstance().cloud2D("ScoreVsNormResidBeforeFailTruthMatch").fill(normalisedResidualBefore, tmpScore);
-			AIDA.defaultInstance().cloud2D("ScoreVsNormResidAfterFailTruthMatch").fill(normalisedResidualAfter, tmpScore);
-		    }
-		}
-	    }

 	    if (passesEoverPafter) {
 		// OK -- satisfies E/p now
 		if (m_debug) { System.out.println("DEBUG: E/p now passes... E is "+energyBefore+"  ->  "+energyAfter); }

@@ -1471,7 +1446,7 @@

 	if (result != null) {
 	    for (int iLayer=0; iLayer<nLayers; iLayer++) {
 		Long cellID = result.extendToECALLayerAndFindCell(iLayer);

-		if (allClusterHits.contains(cellID)) {

+		if (cellID != null && allClusterHits.contains(cellID)) {

 		    countMatches++;
 		}
 	    }

@@ -1489,7 +1464,7 @@

 	if (result != null) {
 	    for (int iLayer=0; iLayer<nLayers; iLayer++) {
 		Long cellID = result.extendToECALLayerAndFindCell(iLayer);

-		if (coreClusterHits.contains(cellID)) {

+		if (cellID != null && coreClusterHits.contains(cellID)) {

 		    countMatches++;
 		}
 	    }