diff -u -r1.2 -r1.3
--- MipFinderCrossingBarrelEndcapBorder.java	5 Jun 2008 20:32:45 -0000	1.2
+++ MipFinderCrossingBarrelEndcapBorder.java	16 Jun 2008 17:15:07 -0000	1.3
@@ -22,7 +22,7 @@

  * able to move from the barrel to the endcap (or vice versa).
  *
  * @author [log in to unmask]

- * @version $Id: MipFinderCrossingBarrelEndcapBorder.java,v 1.2 2008/06/05 20:32:45 mcharles Exp $

+ * @version $Id: MipFinderCrossingBarrelEndcapBorder.java,v 1.3 2008/06/16 17:15:07 mcharles Exp $

  */
 
 public class MipFinderCrossingBarrelEndcapBorder extends TrackClusterDriver

@@ -163,7 +163,7 @@

 		    throw new AssertionError("Unhandled case! minDist1="+minDist1+", minDist2="+minDist2+", minDist3="+minDist3+", minDist4="+minDist4);
 		}
 		boolean passesDistanceCut = (minDist < distCutOff);

-		System.out.println("DEBUG: Found candidate for connecting stubs! Distances are "+minDist1+", "+minDist2+", "+minDist3+", "+minDist4);

+		if (m_debug) { System.out.println("DEBUG: Found candidate for connecting stubs! Distances are "+minDist1+", "+minDist2+", "+minDist3+", "+minDist4); }

 		if (passesDistanceCut) {
 		    double debugBestDist = 0.0;
 		    if (bestEndcapInner) {

@@ -171,7 +171,7 @@

 		    } else {
 			if (bestBarrelInner) { debugBestDist = minDist3; } else { debugBestDist = minDist4; }
 		    }

-		    System.out.println("DEBUG: Passes distance cut! bestEndcapInner="+bestEndcapInner+", bestBarrelInner="+bestBarrelInner+" --> bestDist="+debugBestDist);

+		    if (m_debug) { System.out.println("DEBUG: Passes distance cut! bestEndcapInner="+bestEndcapInner+", bestBarrelInner="+bestBarrelInner+" --> bestDist="+debugBestDist); }

 		    // Check direction.
 		    // For this, we want the hits in the previous layer too...
 		    List<CalorimeterHit> hitsInBarrelLayerMinusZero;

@@ -198,7 +198,7 @@

 		    Hep3Vector directionEndcap = findTangentDirection(hitsInEndcapLayerMinusZero, hitsInEndcapLayerMinusOne);
 		    Hep3Vector directionBarrel = findTangentDirection(hitsInBarrelLayerMinusZero, hitsInBarrelLayerMinusOne);
 		    double dotProduct = VecOp.dot(directionEndcap, directionBarrel);

-		    System.out.println("DEBUG: Dot product of tangents = "+dotProduct);

+		    if (m_debug) { System.out.println("DEBUG: Dot product of tangents = "+dotProduct); }

 		    double dotProductCut = 0.7; // FIXME: Don't hard-code
 		    if (Math.abs(dotProduct) > 0.7) {
 			Merge mergeCand = new Merge();

@@ -269,7 +269,7 @@

 	    Cluster targetOfBarrelClus = bestMergeMapBarrelToEndcap.get(barrelClus);
 	    if (targetOfBarrelClus == endcapClus) {
 		// All self-consistent

-		System.out.println("Will do a merge of endcap MIP["+endcapClus.getCalorimeterHits().size()+"] -> barrel MIP["+barrelClus.getCalorimeterHits().size()+"]");

+		if (m_debug) { System.out.println("Will do a merge of endcap MIP["+endcapClus.getCalorimeterHits().size()+"] -> barrel MIP["+barrelClus.getCalorimeterHits().size()+"]"); }

 		outputList.remove(endcapClus);
 		outputList.remove(barrelClus);
 		MIPCluster newClus = new MIPCluster(1,1);