diff -u -r1.13 -r1.14
--- Trajectory.cc	19 Oct 2005 22:51:18 -0000	1.13
+++ Trajectory.cc	1 Feb 2006 19:09:43 -0000	1.14
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/Trajectory.cc,v 1.13 2005/10/19 22:51:18 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/Trajectory.cc,v 1.14 2006/02/01 19:09:43 jeremy Exp $

 #include "Trajectory.hh"
 
 // lcdd

@@ -21,6 +21,8 @@

       m_trackID(0),
       m_parentID(0),
       m_posRecord(0),

+      m_globalTime(0),
+      m_endpointEnergy(0),

       m_createdInSimulation(false),
       m_hasEndpointDaughters(false),
       m_backscatter(false),

@@ -49,7 +51,7 @@

 
   void Trajectory::setupManuallyFromTrack(const G4Track* aTrack)
   {

-    TrackInformation* trkInfo = 

+    TrackInformation* trkInfo =

       static_cast<TrackInformation*> (aTrack->GetUserInformation() );
 
     assert( trkInfo );

@@ -57,7 +59,7 @@

     m_parentID = trkInfo->getOriginalTrackID();
 
     // position already added in trajectory ctor

-    m_posRecord->insert(m_posRecord->begin(), 

+    m_posRecord->insert(m_posRecord->begin(),

 			new G4TrajectoryPoint(aTrack->GetVertexPosition() ) );
 
     G4double vKE = aTrack->GetVertexKineticEnergy();

@@ -66,8 +68,7 @@

     G4double magmom = sqrt( vKE * vKE + 2. * vKE*mass );
     m_initialMomentum = magmom * ( aTrack->GetVertexMomentumDirection() );
 

-    m_globalTime = aTrack->GetGlobalTime();    
-    //m_vertexPosition = aTrack->GetVertexPosition();

+    m_globalTime = aTrack->GetGlobalTime();

   }
 
   Trajectory::Trajectory(Trajectory &right)

@@ -79,7 +80,7 @@

     m_PDGEncoding = right.m_PDGEncoding;
     m_trackID = right.m_trackID;
     m_parentID = right.m_parentID;

-    

+

     m_posRecord = new TrajectoryPointContainer();
     for (unsigned int i = 0;
 	 i < right.m_posRecord->size();

@@ -108,18 +109,18 @@

   void Trajectory::MergeTrajectory(G4VTrajectory *secondTrajectory)
   {
     if (!secondTrajectory) return;

-  

+

     Trajectory *seco = (Trajectory*)secondTrajectory;
     G4int pent = seco->GetPointEntries();
     for (int i=1; i<pent; i++) {

-      m_posRecord->push_back((*(seco->m_posRecord))[i]);    

+      m_posRecord->push_back((*(seco->m_posRecord))[i]);

     }
 
     delete (*seco->m_posRecord)[0];
     seco->m_posRecord->clear();

-  }  

+  }

-  const std::string& Trajectory::getFinalStatusString(EFinalStatus fs) 

+  const std::string& Trajectory::getFinalStatusString(EFinalStatus fs)

   {
     static const std::string str_unset = "Unset";
     static const std::string str_invalid = "Invalid";