lcsim/src/org/lcsim/recon/pfa/identifier

diff -u -r1.3 -r1.4
--- SimpleNeutralParticleMaker.java	11 Jul 2006 17:22:48 -0000	1.3
+++ SimpleNeutralParticleMaker.java	12 Jul 2006 17:37:31 -0000	1.4
@@ -1,4 +1,4 @@

-package org.lcsim.recon.pfa.structural.identifier;

+package org.lcsim.recon.pfa.identifier;

 
 import java.util.*;
 import hep.physics.vec.Hep3Vector;

@@ -16,7 +16,7 @@

  *
  * Currently, PID is predetermined and the energy calibration is ad-hoc.
  *

- * @version $Id: SimpleNeutralParticleMaker.java,v 1.3 2006/07/11 17:22:48 mcharles Exp $

+ * @version $Id: SimpleNeutralParticleMaker.java,v 1.4 2006/07/12 17:37:31 mcharles Exp $

  */
 
 public class SimpleNeutralParticleMaker extends Driver

lcsim/src/org/lcsim/recon/pfa/identifier

diff -u -r1.2 -r1.3
--- SimpleChargedParticleMaker.java	5 Jul 2006 20:19:29 -0000	1.2
+++ SimpleChargedParticleMaker.java	12 Jul 2006 17:37:31 -0000	1.3
@@ -1,4 +1,4 @@

-package org.lcsim.recon.pfa.structural.identifier;

+package org.lcsim.recon.pfa.identifier;

 
 import java.util.*;
 import hep.physics.vec.*;

@@ -24,7 +24,7 @@

  *
  * Currently, PID is done by cheating.
  *

- * @version $Id: SimpleChargedParticleMaker.java,v 1.2 2006/07/05 20:19:29 mcharles Exp $

+ * @version $Id: SimpleChargedParticleMaker.java,v 1.3 2006/07/12 17:37:31 mcharles Exp $

  */
 
 public class SimpleChargedParticleMaker extends Driver

@@ -37,6 +37,7 @@

     public void setInputMIPList(String name){ m_inputMIPListName = name; }
     public void setInputClusterList(String name){ m_inputClusterListName = name; }
     public void setOutputParticleList(String name){ m_outputParticleListName = name; }

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

 
     public void process(EventHeader event)
     {

@@ -111,6 +112,10 @@

 		    if (clustersInsideParent.contains(matchedMIP)) {
 			// Found it
 			matchedCluster = parent;

+			if (m_debug) { 
+			    Hep3Vector momentumVec = new BasicHep3Vector(tr.getMomentum());
+			    System.out.println("DEBUG: Extrapolated track to MIP (momentum = "+momentumVec.magnitude()+")"); 
+			}

 			break;
 		    }
 		}

@@ -122,9 +127,17 @@

 	    if (matchedCluster != null) {
 		// We found a match
 		matchedTracks.put(tr, matchedCluster);

+		if (m_debug) { 
+		    Hep3Vector momentumVec = new BasicHep3Vector(tr.getMomentum());
+		    System.out.println("DEBUG: Extrapolated track to cluster (momentum = "+momentumVec.magnitude()+")"); 
+		}

 	    } else {
 		// No match -- put the track into the list of unused tracks
 		outputTrackList.add(tr);

+		if (m_debug) { 
+		    Hep3Vector momentumVec = new BasicHep3Vector(tr.getMomentum());
+		    System.out.println("DEBUG: Failed to extrapolate track (momentum = "+momentumVec.magnitude()+")"); 
+		}

 	    }
 	}
 

@@ -377,6 +390,7 @@

     protected double m_ECAL_endcap_z;
     protected double m_ECAL_endcap_rmin;
     protected double m_ECAL_endcap_rmax;

+    protected boolean m_debug = false;

 
     String m_inputTrackListName;
     String m_outputTrackListName;