Import Geant4 11.3.0 source tree

source/tracking/include/G4Trajectory.hh

@@ -51,6 +51,7 @@
 #include "G4VTrajectory.hh"
 #include "G4ios.hh"  // Include from 'system'
 #include "globals.hh"  // Include from 'global'
+#include "G4Threading.hh"
 
 #include "trkgdefs.hh"
 #include <stdlib.h>  // Include from 'system'
@@ -58,11 +59,14 @@
 #include <vector>
 
 class G4Polyline;
+class G4ClonedTrajectory;
 
 class G4Trajectory : public G4VTrajectory
 {
   using G4TrajectoryPointContainer = std::vector<G4VTrajectoryPoint*>;
 
+  friend class G4ClonedTrajectory;
+
  public:
   // Constructors/Destructor
 
@@ -77,6 +81,9 @@ class G4Trajectory : public G4VTrajectory
   inline void operator delete(void*);
   inline G4bool operator==(const G4Trajectory& r) const;
 
+  // cloning with the master thread allocator
+  G4VTrajectory* CloneForMaster() const override;
+
   // Get/Set functions
 
   inline G4int GetTrackID() const override { return fTrackID; }
@@ -107,7 +114,7 @@ class G4Trajectory : public G4VTrajectory
   G4int fParentID = 0;
   G4int PDGEncoding = 0;
   G4double PDGCharge = 0.0;
-  G4String ParticleName = "";
+  G4String ParticleName = "dummy";
   G4double initialKineticEnergy = 0.0;
   G4ThreeVector initialMomentum;
 };