Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/tracking/include/G4Trajectory.hh

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /tracking/include/G4Trajectory.hh (Version 11.3.0) and /tracking/include/G4Trajectory.hh (Version 10.6.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 // G4Trajectory                                    26 // G4Trajectory
 27 //                                                 27 //
 28 // Class description:                          <<  28 // class description:
 29 //                                             <<  29 //   This class represents the trajectory of a particle tracked.
 30 // This class represents the trajectory of a p <<  30 //   It includes information of 
 31 // It includes information of:                 <<  31 //     1) List of trajectory points which compose the trajectory,
 32 //     1) List of trajectory points which comp <<  32 //     2) static information of particle which generated the 
 33 //     2) Static information of the particle w <<  33 //        trajectory, 
 34 //        trajectory;                          <<  34 //     3) trackID and parent particle ID of the trajectory,
 35 //     3) Track ID and parent particle ID of t << 
 36                                                    35 
 37 // Contact:                                        36 // Contact:
 38 //   Questions and comments to this code shoul     37 //   Questions and comments to this code should be sent to
 39 //     Katsuya Amako  (e-mail: Katsuya.Amako@k     38 //     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
 40 //     Makoto  Asai   (e-mail: asai@slac.stanf <<  39 //     Makoto  Asai   (e-mail: asai@kekvax.kek.jp)
 41 //     Takashi Sasaki (e-mail: Takashi.Sasaki@     40 //     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
                                                   >>  41 //
 42 // -------------------------------------------     42 // --------------------------------------------------------------------
 43 #ifndef G4Trajectory_hh                            43 #ifndef G4Trajectory_hh
 44 #define G4Trajectory_hh 1                          44 #define G4Trajectory_hh 1
 45                                                    45 
                                                   >>  46 #include <stdlib.h>                 // Include from 'system'
                                                   >>  47 #include <vector>
                                                   >>  48 
                                                   >>  49 #include "trkgdefs.hh"
                                                   >>  50 #include "G4VTrajectory.hh"
 46 #include "G4Allocator.hh"                          51 #include "G4Allocator.hh"
                                                   >>  52 #include "G4ios.hh"                 // Include from 'system'
                                                   >>  53 #include "globals.hh"               // Include from 'global'
 47 #include "G4ParticleDefinition.hh"  // Include     54 #include "G4ParticleDefinition.hh"  // Include from 'particle+matter'
 48 #include "G4Step.hh"                           <<  55 #include "G4TrajectoryPoint.hh"     // Include from 'tracking'
 49 #include "G4Track.hh"                              56 #include "G4Track.hh"
 50 #include "G4TrajectoryPoint.hh"  // Include fr <<  57 #include "G4Step.hh"
 51 #include "G4VTrajectory.hh"                    << 
 52 #include "G4ios.hh"  // Include from 'system'  << 
 53 #include "globals.hh"  // Include from 'global << 
 54 #include "G4Threading.hh"                      << 
 55                                                << 
 56 #include "trkgdefs.hh"                         << 
 57 #include <stdlib.h>  // Include from 'system'  << 
 58                                                << 
 59 #include <vector>                              << 
 60                                                    58 
 61 class G4Polyline;                                  59 class G4Polyline;
 62 class G4ClonedTrajectory;                      << 
 63                                                    60 
                                                   >>  61 ///////////////////
 64 class G4Trajectory : public G4VTrajectory          62 class G4Trajectory : public G4VTrajectory
                                                   >>  63 ///////////////////
 65 {                                                  64 {
 66   using G4TrajectoryPointContainer = std::vect << 
 67                                                << 
 68   friend class G4ClonedTrajectory;             << 
 69                                                    65 
 70  public:                                       <<  66    using TrajectoryPointContainer = std::vector<G4VTrajectoryPoint*>;
 71   // Constructors/Destructor                   << 
 72                                                    67 
 73   G4Trajectory() = default;                    <<  68   //--------
 74   G4Trajectory(const G4Track* aTrack);         <<  69   public: // with description
 75   G4Trajectory(G4Trajectory&);                 <<  70   //--------
 76   ~G4Trajectory() override;                    <<  71 
                                                   >>  72   // Constructor/Destructor
                                                   >>  73 
                                                   >>  74    G4Trajectory();
                                                   >>  75    G4Trajectory(const G4Track* aTrack);
                                                   >>  76    G4Trajectory(G4Trajectory &);
                                                   >>  77    virtual ~G4Trajectory();
 77                                                    78 
 78   // Operators                                     79   // Operators
 79                                                    80 
 80   inline void* operator new(size_t);           <<  81    inline void* operator new(size_t);
 81   inline void operator delete(void*);          <<  82    inline void  operator delete(void*);
 82   inline G4bool operator==(const G4Trajectory& <<  83    G4int operator == (const G4Trajectory& r) const {return (this==&r);} 
 83                                                <<  84 
 84   // cloning with the master thread allocator  <<  85   // Get/Set functions 
 85   G4VTrajectory* CloneForMaster() const overri <<  86 
 86                                                <<  87    inline G4int GetTrackID() const
 87   // Get/Set functions                         <<  88    { return fTrackID; }
 88                                                <<  89    inline G4int GetParentID() const
 89   inline G4int GetTrackID() const override { r <<  90    { return fParentID; }
 90   inline G4int GetParentID() const override {  <<  91    inline G4String GetParticleName() const
 91   inline G4String GetParticleName() const over <<  92    { return ParticleName; }
 92   inline G4double GetCharge() const override { <<  93    inline G4double GetCharge() const
 93   inline G4int GetPDGEncoding() const override <<  94    { return PDGCharge; }
 94   inline G4double GetInitialKineticEnergy() co <<  95    inline G4int GetPDGEncoding() const
 95   inline G4ThreeVector GetInitialMomentum() co <<  96    { return PDGEncoding; }
                                                   >>  97    inline G4double GetInitialKineticEnergy() const
                                                   >>  98    { return initialKineticEnergy; }
                                                   >>  99    inline G4ThreeVector GetInitialMomentum() const
                                                   >> 100    { return initialMomentum; }
 96                                                   101 
 97   // Other member functions                       102   // Other member functions
 98                                                   103 
 99   void ShowTrajectory(std::ostream& os = G4cou << 104    virtual void ShowTrajectory(std::ostream& os=G4cout) const;
100   void DrawTrajectory() const override;        << 105    virtual void DrawTrajectory() const;
101   void AppendStep(const G4Step* aStep) overrid << 106    virtual void AppendStep(const G4Step* aStep);
102   G4int GetPointEntries() const override { ret << 107    virtual G4int GetPointEntries() const {return G4int(positionRecord->size());}
103   G4VTrajectoryPoint* GetPoint(G4int i) const  << 108    virtual G4VTrajectoryPoint* GetPoint(G4int i) const { return (*positionRecord)[i]; }
104   void MergeTrajectory(G4VTrajectory* secondTr << 109    virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
105                                                << 110 
106   G4ParticleDefinition* GetParticleDefinition( << 111    G4ParticleDefinition* GetParticleDefinition();
107                                                << 112 
108   const std::map<G4String, G4AttDef>* GetAttDe << 113    virtual const std::map<G4String,G4AttDef>* GetAttDefs() const;
109   std::vector<G4AttValue>* CreateAttValues() c << 114    virtual std::vector<G4AttValue>* CreateAttValues() const;
110                                                << 115 
111  private:                                      << 116   //---------
112   G4TrajectoryPointContainer* positionRecord = << 117   private:
113   G4int fTrackID = 0;                          << 118   //---------
114   G4int fParentID = 0;                         << 119 
115   G4int PDGEncoding = 0;                       << 120   TrajectoryPointContainer* positionRecord;
116   G4double PDGCharge = 0.0;                    << 121   G4int                     fTrackID;
117   G4String ParticleName = "dummy";             << 122   G4int                     fParentID;
118   G4double initialKineticEnergy = 0.0;         << 123   G4int                     PDGEncoding;
119   G4ThreeVector initialMomentum;               << 124   G4double                  PDGCharge;
                                                   >> 125   G4String                  ParticleName;
                                                   >> 126   G4double                  initialKineticEnergy;
                                                   >> 127   G4ThreeVector             initialMomentum;
                                                   >> 128 
120 };                                                129 };
121                                                   130 
122 extern G4TRACKING_DLL G4Allocator<G4Trajectory    131 extern G4TRACKING_DLL G4Allocator<G4Trajectory>*& aTrajectoryAllocator();
123                                                   132 
124 inline void* G4Trajectory::operator new(size_t    133 inline void* G4Trajectory::operator new(size_t)
125 {                                                 134 {
126   if (aTrajectoryAllocator() == nullptr) {     << 135   if (!aTrajectoryAllocator())
127     aTrajectoryAllocator() = new G4Allocator<G << 136   { aTrajectoryAllocator() = new G4Allocator<G4Trajectory>; }
128   }                                            << 
129   return (void*)aTrajectoryAllocator()->Malloc    137   return (void*)aTrajectoryAllocator()->MallocSingle();
130 }                                                 138 }
131                                                   139 
132 inline void G4Trajectory::operator delete(void    140 inline void G4Trajectory::operator delete(void* aTrajectory)
133 {                                                 141 {
134   aTrajectoryAllocator()->FreeSingle((G4Trajec    142   aTrajectoryAllocator()->FreeSingle((G4Trajectory*)aTrajectory);
135 }                                                 143 }
136                                                << 
137 inline G4bool G4Trajectory::operator==(const G << 
138                                                   144 
139 #endif                                            145 #endif
140                                                   146