Import Geant4 10.0.0 source tree

source/tracking/src/G4Trajectory.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id$
+// $Id: G4Trajectory.cc 69003 2013-04-15 09:25:23Z gcosmo $
 //
 // ---------------------------------------------------------------
 //
@@ -52,7 +52,7 @@
 #include "G4AttCheck.hh"
 #endif
 
-G4Allocator<G4Trajectory> aTrajectoryAllocator;
+G4ThreadLocal G4Allocator<G4Trajectory> *aTrajectoryAllocator = 0;
 
 G4Trajectory::G4Trajectory()
 :  positionRecord(0), fTrackID(0), fParentID(0),
@@ -96,7 +96,6 @@ G4Trajectory::G4Trajectory(G4Trajectory & right):G4VTrajectory()
 G4Trajectory::~G4Trajectory()
 {
   if (positionRecord) {
-    //  positionRecord->clearAndDestroy();
     size_t i;
     for(i=0;i<positionRecord->size();i++){
       delete  (*positionRecord)[i];
@@ -113,21 +112,12 @@ void G4Trajectory::ShowTrajectory(std::ostream& os) const
   // ... or override with your own code here.
 }
 
-/***
 void G4Trajectory::DrawTrajectory() const
 {
   // Invoke the default implementation in G4VTrajectory...
   G4VTrajectory::DrawTrajectory();
   // ... or override with your own code here.
 }
-***/
-
-void G4Trajectory::DrawTrajectory(G4int i_mode) const
-{
-  // Invoke the default implementation in G4VTrajectory...
-  G4VTrajectory::DrawTrajectory(i_mode);
-  // ... or override with your own code here.
-}
 
 const std::map<G4String,G4AttDef>* G4Trajectory::GetAttDefs() const
 {
@@ -229,10 +219,7 @@ void G4Trajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
   for(G4int i=1;i<ent;i++) // initial point of the second trajectory should not be merged
   { 
     positionRecord->push_back((*(seco->positionRecord))[i]);
-    //    positionRecord->push_back(seco->positionRecord->removeAt(1));
   }
   delete (*seco->positionRecord)[0];
   seco->positionRecord->clear();
 }
-
-