slic/include

diff -u -r1.47 -r1.48
--- LcioMcpManager.hh	16 Dec 2005 02:09:03 -0000	1.47
+++ LcioMcpManager.hh	4 Apr 2006 22:45:27 -0000	1.48
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/LcioMcpManager.hh,v 1.47 2005/12/16 02:09:03 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/LcioMcpManager.hh,v 1.48 2006/04/04 22:45:27 jeremy Exp $

 #ifndef slic_LcioMcpManager_hh
 #define slic_LcioMcpManager_hh 1
 

@@ -109,7 +109,7 @@

 
     double getNoChargeFlag() const
     {

-      return NO_CHARGE_FLAG;

+      return NAN;

     }
 
   private:

@@ -151,7 +151,7 @@

     bool m_enablePrintInitial;
 
   public:

-    static const double NO_CHARGE_FLAG;

+    static const double m_NAN;

   };
 }
 

slic/src

diff -u -r1.7 -r1.8
--- LcioMcpFactory.cc	7 Oct 2005 21:54:39 -0000	1.7
+++ LcioMcpFactory.cc	4 Apr 2006 22:45:27 -0000	1.8
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.7 2005/10/07 21:54:39 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMcpFactory.cc,v 1.8 2006/04/04 22:45:27 jeremy Exp $

 #include "LcioMcpFactory.hh"
 
 // slic

@@ -22,9 +22,9 @@

 
 using IMPL::LCCollectionVec;
 using IMPL::LCGenericObjectImpl;

+using IMPL::MCParticleImpl;

 using EVENT::LCIO;
 using EVENT::MCParticle;

-using IMPL::MCParticleImpl;

 
 #include <iostream>
 

@@ -279,6 +279,8 @@

 
     mcpNew->setCharge( mcp->getCharge() );
 

+    mcpNew->setTime( mcp->getTime() );
+

     return mcpNew;
   }
 

@@ -299,7 +301,7 @@

     mcp->setMass( primary->GetMass() / GeV );
 
     /* FIXME: Wrong if G4PrimaryParticle actually has valid charge.  (Can it happen here???) */

-    mcp->setCharge( LcioMcpManager::NO_CHARGE_FLAG );

+    mcp->setCharge( LcioMcpManager::m_NAN );

 
     return mcp;
   }

@@ -338,6 +340,9 @@

     double fEndPos[3] = { endPos.x(), endPos.y(), endPos.z() };
     mcp->setEndpoint( fEndPos );
 

+    // time
+    mcp->setTime( trj->GetGlobalTime() );
+

     // add to map of trkID -> mcp
     m_manager->getMaps()->addTrackIDToMcpLink( trj->GetTrackID(), mcp );
 

slic/src

diff -u -r1.60 -r1.61
--- LcioMcpManager.cc	16 Dec 2005 02:09:03 -0000	1.60
+++ LcioMcpManager.cc	4 Apr 2006 22:45:27 -0000	1.61
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.60 2005/12/16 02:09:03 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/LcioMcpManager.cc,v 1.61 2006/04/04 22:45:27 jeremy Exp $

 #include "LcioMcpManager.hh"
 
 // slic

@@ -39,7 +39,7 @@

 
   LcioMcpManager* LcioMcpManager::m_instance = 0;
 

-  const double LcioMcpManager::NO_CHARGE_FLAG = std::sqrt((double)-1.0);

+  const double LcioMcpManager::m_NAN = std::sqrt((double)-1.0);

 
   LcioMcpManager::~LcioMcpManager()
   {}

@@ -70,8 +70,8 @@

     /* Create the MCParticle data maps object. */
     m_maps = new LcioMcpMaps(this);
 

-    /* Check NO_CHARGE_FLAG == NaN */
-    assert( NO_CHARGE_FLAG != NO_CHARGE_FLAG );

+    /* Check NAN != NAN */
+    assert( m_NAN != m_NAN );

   }
 
   void LcioMcpManager::endEvent(const G4Event* event)

slic/src

diff -u -r1.29 -r1.30
--- StdHepToLcioConvertor.cc	29 Nov 2005 00:23:16 -0000	1.29
+++ StdHepToLcioConvertor.cc	4 Apr 2006 22:45:28 -0000	1.30
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.29 2005/11/29 00:23:16 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/StdHepToLcioConvertor.cc,v 1.30 2006/04/04 22:45:28 jeremy Exp $

 #include "StdHepToLcioConvertor.hh"
 
 // slic

@@ -207,7 +207,7 @@

      * No Geant4 particle definition, so flag charge as invalid.
      */
     else {

-      mcp->setCharge( LcioMcpManager::NO_CHARGE_FLAG );

+      mcp->setCharge( LcioMcpManager::m_NAN );

     }
 
     // momentum vec

slic/src

diff -u -r1.14 -r1.15
--- Trajectory.cc	1 Feb 2006 19:09:43 -0000	1.14
+++ Trajectory.cc	4 Apr 2006 22:45:28 -0000	1.15
@@ -1,4 +1,4 @@

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

+// $Header: /cvs/lcd/slic/src/Trajectory.cc,v 1.15 2006/04/04 22:45:28 jeremy Exp $

 #include "Trajectory.hh"
 
 // lcdd

@@ -47,6 +47,8 @@

     m_hasEndpointDaughters=false;
     m_backscatter=false;
     m_vertexIsNotEndpointOfParent=false;

+
+    m_globalTime = aTrack->GetGlobalTime();

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

@@ -80,6 +82,7 @@

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

+    m_globalTime = right.m_globalTime;

 
     m_posRecord = new TrajectoryPointContainer();
     for (unsigned int i = 0;