diff -u -r1.1 -r1.2
--- MIPChargedParticleMaker.java	10 Aug 2006 22:57:56 -0000	1.1
+++ MIPChargedParticleMaker.java	17 Aug 2006 20:55:37 -0000	1.2
@@ -10,6 +10,7 @@

 import org.lcsim.event.Cluster;
 import org.lcsim.mc.fast.tracking.ReconTrack;
 import org.lcsim.event.base.BaseReconstructedParticle;

+import org.lcsim.recon.ztracking.cheater.CheatTrack;

 
 /**
  * Given a list of MIP clusters and a list of tracks,

@@ -26,7 +27,7 @@

  * then the entire cluster is added to the ReconstructedParticle instead.
  * The parent must be unique.
  *

- * @version $Id: MIPChargedParticleMaker.java,v 1.1 2006/08/10 22:57:56 mcharles Exp $

+ * @version $Id: MIPChargedParticleMaker.java,v 1.2 2006/08/17 20:55:37 mcharles Exp $

  */
 
 public class MIPChargedParticleMaker

@@ -203,11 +204,14 @@

 		double[] trackMomentum = tr.getMomentum();
 		double trackMomentumMagSq = (trackMomentum[0]*trackMomentum[0] + trackMomentum[1]*trackMomentum[1] + trackMomentum[2]*trackMomentum[2]);
 		double mass = 0.140;

+		Particle truthParticle = null;

 		if (tr instanceof ReconTrack) {

-		    Particle truthParticle = ((ReconTrack)(tr)).getMCParticle();
-		    if (truthParticle != null) {
-			mass = truthParticle.getMass();
-		    }

+		    truthParticle = ((ReconTrack)(tr)).getMCParticle();
+		} else if (tr instanceof CheatTrack) {
+		    truthParticle = ((CheatTrack)(tr)).getMCParticle();
+		}
+		if (truthParticle != null) {
+		    mass = truthParticle.getMass();

 		}
 		double trackEnergy = Math.sqrt(trackMomentumMagSq + mass*mass);
 		energy += trackEnergy;

diff -u -r1.5 -r1.6
--- SimpleChargedParticleMaker.java	10 Aug 2006 22:57:34 -0000	1.5
+++ SimpleChargedParticleMaker.java	17 Aug 2006 20:55:37 -0000	1.6
@@ -17,6 +17,7 @@

 import org.lcsim.recon.cluster.util.TensorClusterPropertyCalculator;
 import org.lcsim.mc.fast.tracking.ReconTrack;
 import org.lcsim.event.base.BaseReconstructedParticle;

+import org.lcsim.recon.ztracking.cheater.CheatTrack;

 
 /**
  * Given lists of clusters and tracks, make a list of charged

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

  *
  * Currently, PID is done by cheating.
  *

- * @version $Id: SimpleChargedParticleMaker.java,v 1.5 2006/08/10 22:57:34 mcharles Exp $

+ * @version $Id: SimpleChargedParticleMaker.java,v 1.6 2006/08/17 20:55:37 mcharles Exp $

  */
 
 public class SimpleChargedParticleMaker extends Driver

@@ -117,11 +118,14 @@

 		double[] trackMomentum = tr.getMomentum();
 		double trackMomentumMagSq = (trackMomentum[0]*trackMomentum[0] + trackMomentum[1]*trackMomentum[1] + trackMomentum[2]*trackMomentum[2]);
 		double mass = 0.140;

+		Particle truthParticle = null;

 		if (tr instanceof ReconTrack) {

-		    Particle truthParticle = ((ReconTrack)(tr)).getMCParticle();
-		    if (truthParticle != null) {
-			mass = truthParticle.getMass();
-		    }

+		    truthParticle = ((ReconTrack)(tr)).getMCParticle();
+		} else if (tr instanceof CheatTrack) {
+		    truthParticle = ((CheatTrack)(tr)).getMCParticle();
+		}
+		if (truthParticle != null) {
+		    mass = truthParticle.getMass();

 		}
 		double trackEnergy = Math.sqrt(trackMomentumMagSq + mass*mass);
 		energy += trackEnergy;