Commit in lcsim/src/org/lcsim/mc/fast/reconstructedparticle on MAIN
MCFastReconstructedParticle.java+6-41.1 -> 1.2
return energy and momentum from fourvector.

lcsim/src/org/lcsim/mc/fast/reconstructedparticle
MCFastReconstructedParticle.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MCFastReconstructedParticle.java	1 Jul 2005 23:50:55 -0000	1.1
+++ MCFastReconstructedParticle.java	2 Jul 2005 00:12:16 -0000	1.2
@@ -22,8 +22,8 @@
 {
     // ReconstructedParticle attributes
     private int _type;
-    private Hep3Vector _momentum;
-    private double _energy;
+//    private Hep3Vector _momentum;
+//    private double _energy;
     private double[] _covMatrix;
     private double _mass;
     private double _charge;
@@ -43,6 +43,7 @@
         addTrack(t);
         double e = sqrt(t.getPX()*t.getPX()+t.getPY()*t.getPY()+t.getPZ()*t.getPZ() + mass*mass);
         _fourVec.setV3(e, t.getPX(), t.getPY(), t.getPZ());
+        _charge = t.getCharge();
     }
     
     public MCFastReconstructedParticle(Cluster c, double mass)
@@ -58,6 +59,7 @@
         double py = p*pos.sinPhi()*pos.cosTheta();
         double pz = p*pos.cosTheta();
         _fourVec.setV3(e, px, py, pz);
+        _charge = 0.;
     }
   
     // ReconstructedParticle interface
@@ -73,14 +75,14 @@
      */
     public Hep3Vector getMomentum()
     {
-        return _momentum;
+        return _fourVec.v3();
     }
     
     /** Energy of the  reconstructed particle
      */
     public double getEnergy()
     {
-        return _energy;
+        return _fourVec.t();
     }
     
     /** Covariance matrix of the reconstructed particle's 4vector (10 parameters).
CVSspam 0.2.8