diff -u -r1.3 -r1.4
--- ReconstructedParticleConverter.java	25 Aug 2005 05:54:10 -0000	1.3
+++ ReconstructedParticleConverter.java	5 Apr 2006 11:54:14 -0000	1.4
@@ -17,7 +17,7 @@

 
 /**
  * @author tonyj

- * @version $Id: ReconstructedParticleConverter.java,v 1.3 2005/08/25 05:54:10 tonyj Exp $

+ * @version $Id: ReconstructedParticleConverter.java,v 1.4 2006/04/05 11:54:14 tonyj Exp $

  */
 class ReconstructedParticleConverter implements HepRepCollectionConverter
 {

@@ -55,7 +55,7 @@

       typeX.addAttValue("layer",LCSimHepRepConverter.PARTICLES_LAYER);
       typeX.addAttValue("drawAs","Line");
       typeX.addAttValue("width",2);

-      typeX.addAttDef("energy","Particle Energy", "physics", "");

+      typeX.addAttDef("momentum","Particle Momentum", "physics", "");

       typeX.addAttDef("type","Particle Type", "physics", "");
       
       boolean jets = name.toLowerCase().contains("jets");

@@ -64,7 +64,7 @@

          HepRepType jetTypeX = factory.createHepRepType(typeX, name+"Particles");
          jetTypeX.addAttValue("layer",LCSimHepRepConverter.PARTICLES_LAYER);
          jetTypeX.addAttValue("drawAs","Line");

-         jetTypeX.addAttDef("energy","Particle Energy", "physics", "");

+         jetTypeX.addAttDef("momentum","Particle Momentum", "physics", "");

          jetTypeX.addAttDef("type","Particle Type", "physics", "");
          
          int i = 0;

@@ -119,14 +119,14 @@

          
          factory.createHepRepPoint(instanceX,start.x(),start.y(),start.z());
          factory.createHepRepPoint(instanceX,stop.x(),stop.y(),stop.z());

-         instanceX.addAttValue("energy",p.getEnergy());

+         instanceX.addAttValue("momentum",p.getEnergy());

          instanceX.addAttValue("type",p.getType());
       }
       else
       {
          double dAlpha = 10; // 1cm
          

-         instanceX.addAttValue("energy",p.getEnergy());

+         instanceX.addAttValue("momentum",p.getEnergy());

          instanceX.addAttValue("type",p.getType());
          factory.createHepRepPoint(instanceX,start.x(),start.y(),start.z());
          

diff -u -r1.5 -r1.6
--- MCParticleConverter.java	22 Aug 2005 18:42:59 -0000	1.5
+++ MCParticleConverter.java	5 Apr 2006 11:54:14 -0000	1.6
@@ -20,7 +20,7 @@

 /**
  *
  * @author tonyj

- * @version $Id: MCParticleConverter.java,v 1.5 2005/08/22 18:42:59 tonyj Exp $

+ * @version $Id: MCParticleConverter.java,v 1.6 2006/04/05 11:54:14 tonyj Exp $

  */
 class MCParticleConverter implements HepRepCollectionConverter
 {

@@ -48,7 +48,7 @@

       HepRepType typeX = factory.createHepRepType(typeTree, name);
       typeX.addAttValue("layer",LCSimHepRepConverter.PARTICLES_LAYER);
       typeX.addAttValue("drawAs","Line");

-      typeX.addAttDef("energy","Particle Energy", "physics", "");

+      typeX.addAttDef("momentum","Particle Momentum", "physics", "");

       typeX.addAttDef("type","Particle Type", "physics", "");
       
       HepRepType neutralType = factory.createHepRepType(typeX, "Neutral");

@@ -96,7 +96,7 @@

                HepRepInstance instanceX = factory.createHepRepInstance(charge == 0 ? neutral : charged, charge == 0 ? neutralType : chargedType);
                factory.createHepRepPoint(instanceX,start.x(),start.y(),start.z());
                factory.createHepRepPoint(instanceX,stop.x(),stop.y(),stop.z());

-               instanceX.addAttValue("energy",p.getEnergy());

+               instanceX.addAttValue("momentum",p.getEnergy());

                instanceX.addAttValue("type",p.getType().getName());
             }
             else

@@ -108,7 +108,7 @@

                {
                   double dAlpha = 10; // 1cm
                   HepRepInstance instanceX = factory.createHepRepInstance(charged, chargedType);

-                  instanceX.addAttValue("energy",p.getEnergy());

+                  instanceX.addAttValue("momentum",p.getEnergy());

                   instanceX.addAttValue("pdgid",p.getType().getName());
                   factory.createHepRepPoint(instanceX,start.x(),start.y(),start.z());
                   double absZ = Math.abs(stop.z());

diff -u -r1.2 -r1.3
--- SimTrackerHitConverter.java	4 Aug 2005 08:04:29 -0000	1.2
+++ SimTrackerHitConverter.java	5 Apr 2006 11:54:14 -0000	1.3
@@ -10,12 +10,13 @@

 import java.util.List;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.EventHeader.LCMetaData;

+import org.lcsim.event.MCParticle;

 import org.lcsim.event.SimTrackerHit;
 
 /**
  *
  * @author tonyj

- * @version $Id: SimTrackerHitConverter.java,v 1.2 2005/08/04 08:04:29 ngraf Exp $

+ * @version $Id: SimTrackerHitConverter.java,v 1.3 2006/04/05 11:54:14 tonyj Exp $

  */
 class SimTrackerHitConverter implements HepRepCollectionConverter
 {

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

       typeX.addAttValue("MarkName","Box");
       typeX.addAttDef("dEdx", "Hit dEdx", "physics", "");
       typeX.addAttDef("time", "Hit time", "physics", "");

+      typeX.addAttDef("mcEnergy", "MC Particle Energy", "physics", "");

       
       for (SimTrackerHit hit : (List<SimTrackerHit>) collection)
       {

@@ -44,6 +46,8 @@

          HepRepInstance instanceX = factory.createHepRepInstance(instanceTree, typeX);
          instanceX.addAttValue("dEdx",hit.getdEdx());
          instanceX.addAttValue("time",hit.getTime());

+         MCParticle particle = hit.getMCParticle();
+         if (particle != null) instanceX.addAttValue("mcEnergy",particle.getEnergy());

          HepRepPoint pp = factory.createHepRepPoint(instanceX,pos[0],pos[1],pos[2]);
       }
    }