lcsim/src/org/lcsim/mc/fast/reconstructedparticle

diff -u -r1.2 -r1.3
--- MCFastReconstructedParticle.java	2 Jul 2005 00:12:16 -0000	1.2
+++ MCFastReconstructedParticle.java	2 Jul 2005 01:28:44 -0000	1.3
@@ -1,5 +1,6 @@

 package org.lcsim.mc.fast.reconstructedparticle;
 

+import hep.physics.vec.BasicHep3Vector;

 import hep.physics.vec.BasicHepLorentzVector;
 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.HepLorentzVector;

@@ -24,10 +25,10 @@

     private int _type;
 //    private Hep3Vector _momentum;
 //    private double _energy;

-    private double[] _covMatrix;

+    private double[] _covMatrix = new double[10];

     private double _mass;
     private double _charge;

-    private Hep3Vector _referencePoint;

+    private Hep3Vector _referencePoint = new BasicHep3Vector();

     private List<ParticleID> _particleIds = new ArrayList<ParticleID>();
     private ParticleID _particleIdUsed;
     private double _goodnessOfPid;

@@ -98,7 +99,7 @@

      */
     public double getMass()
     {

-        return _mass;

+        return _fourVec.magnitude();

     }
     
     /** Charge of the reconstructed particle.

lcsim/src/org/lcsim/mc/fast/reconstructedparticle

diff -u -r1.2 -r1.3
--- MCFastReconstructedParticleDriver.java	2 Jul 2005 00:21:56 -0000	1.2
+++ MCFastReconstructedParticleDriver.java	2 Jul 2005 01:28:44 -0000	1.3
@@ -16,6 +16,7 @@

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.ReconstructedParticle;
 import org.lcsim.event.Track;

+import org.lcsim.mc.fast.cluster.ronan.ReconHADCluster;

 import org.lcsim.util.Driver;
 
 /**

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

         List<Track> tracks = event.getTracks();
         for(Track t : tracks)
         {

+            // assume pion mass for charged tracks

             double mass = 140.;
 //            System.out.println(t);
             MCFastReconstructedParticle rp = new MCFastReconstructedParticle(t, mass);

@@ -48,11 +50,14 @@

         for(Cluster c : clusters)
         {
 //            System.out.println(c);

-            double mass = 939.;

+            // photons for EM
+            double mass = 0.;
+            // assume neutron here for had cluster
+            if(c instanceof ReconHADCluster) mass = 939.;

             MCFastReconstructedParticle rp = new MCFastReconstructedParticle(c, mass);
             rpList.add(rp);
         }

-        

+       

 //        System.out.println(tracks.size()+ " tracks, "+clusters.size()+" clusters, "+rpList.size()+" reconstructedParticles");
         event.put("MCFastReconstructedParticles", rpList, ReconstructedParticle.class, 0);
     }