Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/tracking/include/G4SmoothTrajectory.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/G4SmoothTrajectory.hh (Version 11.3.0) and /tracking/include/G4SmoothTrajectory.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 // G4SmoothTrajectory                              26 // G4SmoothTrajectory
 27 //                                                 27 //
 28 // Class description:                          <<  28 // class description:
 29 //                                                 29 //
 30 // This class represents the trajectory of a p <<  30 //   This class represents the trajectory of a particle tracked.
 31 // It includes information of                  <<  31 //   It includes information of 
 32 //   1) List of trajectory points which compos <<  32 //     1) List of trajectory points which compose the trajectory,
 33 //   2) static information of particle which g <<  33 //     2) static information of particle which generated the 
 34 //      trajectory,                            <<  34 //        trajectory, 
 35 //   3) trackID and parent particle ID of the  <<  35 //     3) trackID and parent particle ID of the trajectory,
 36 //   4) Auxiliary points will be associated to <<  36 //     4) Auxiliary points will be associated to G4SmoothTrajectoryPoint
 37 //      to assist drawing smoothly curved traj <<  37 //        to assist drawing smoothly curved trajectory.
 38                                                <<  38 
 39 // Contact:                                    << 
 40 //   Questions and comments to this code shoul << 
 41 //     Katsuya Amako  (e-mail: Katsuya.Amako@k << 
 42 //     Makoto  Asai   (e-mail: asai@slac.stanf << 
 43 //     Takashi Sasaki (e-mail: Takashi.Sasaki@ << 
 44 // -------------------------------------------     39 // --------------------------------------------------------------------
 45 #ifndef G4SmoothTrajectory_hh                      40 #ifndef G4SmoothTrajectory_hh
 46 #define G4SmoothTrajectory_hh 1                    41 #define G4SmoothTrajectory_hh 1
 47                                                    42 
 48 #include "G4Allocator.hh"                      <<  43 #include <stdlib.h>                   // Include from 'system'
 49 #include "G4ParticleDefinition.hh"  // Include <<  44 #include <vector>
 50 #include "G4SmoothTrajectoryPoint.hh"  // Incl << 
 51 #include "G4Step.hh"                           << 
 52 #include "G4Track.hh"                          << 
 53 #include "G4VTrajectory.hh"                    << 
 54 #include "G4ios.hh"  // Include from 'system'  << 
 55 #include "globals.hh"  // Include from 'global << 
 56                                                    45 
 57 #include "trkgdefs.hh"                             46 #include "trkgdefs.hh"
 58 #include <stdlib.h>  // Include from 'system'  <<  47 #include "G4VTrajectory.hh"
 59                                                <<  48 #include "G4Allocator.hh"
 60 #include <vector>                              <<  49 #include "G4ios.hh"                   // Include from 'system'
                                                   >>  50 #include "globals.hh"                 // Include from 'global'
                                                   >>  51 #include "G4ParticleDefinition.hh"    // Include from 'particle+matter'
                                                   >>  52 #include "G4SmoothTrajectoryPoint.hh" // Include from 'tracking'
                                                   >>  53 #include "G4Track.hh"
                                                   >>  54 #include "G4Step.hh"
 61                                                    55 
 62 class G4Polyline;                                  56 class G4Polyline;
 63 class G4ClonedSmoothTrajectory;                << 
 64                                                    57 
 65 class G4SmoothTrajectory : public G4VTrajector     58 class G4SmoothTrajectory : public G4VTrajectory
 66 {                                                  59 {
 67   using G4TrajectoryPointContainer = std::vect << 
 68                                                    60 
 69   friend class G4ClonedSmoothTrajectory;       <<  61    using TrajectoryPointContainer = std::vector<G4VTrajectoryPoint*>;
 70                                                    62 
 71  public:                                       <<  63   //--------
 72   // Constructors/Destructor                   <<  64   public: // with description
 73   //                                           <<  65   //--------
 74   G4SmoothTrajectory() = default;              <<  66 
 75   G4SmoothTrajectory(const G4Track* aTrack);   <<  67   // Constructor/Destructor
 76   ~G4SmoothTrajectory() override;              <<  68 
 77   G4SmoothTrajectory(G4SmoothTrajectory&);     <<  69    G4SmoothTrajectory();
 78   G4SmoothTrajectory& operator=(const G4Smooth <<  70    G4SmoothTrajectory(const G4Track* aTrack);
                                                   >>  71    G4SmoothTrajectory(G4SmoothTrajectory &);
                                                   >>  72    virtual ~G4SmoothTrajectory();
 79                                                    73 
 80   // Operators                                     74   // Operators
 81   //                                           <<  75 
 82   inline G4bool operator==(const G4SmoothTraje <<  76    G4SmoothTrajectory& operator= (const G4SmoothTrajectory&) = delete;
 83   inline void* operator new(size_t);           <<  77    G4int operator == (const G4SmoothTrajectory& r) const {return (this==&r);} 
 84   inline void operator delete(void*);          <<  78 
 85                                                <<  79    inline void* operator new(size_t);
 86   // cloning with the master thread allocator  <<  80    inline void  operator delete(void*);
 87   G4VTrajectory* CloneForMaster() const overri <<  81 
 88                                                <<  82   // Get/Set functions 
 89   // Get/Set functions                         <<  83    inline G4int GetTrackID() const
 90   //                                           <<  84    { return fTrackID; }
 91   inline G4int GetTrackID() const override { r <<  85    inline G4int GetParentID() const
 92   inline G4int GetParentID() const override {  <<  86    { return fParentID; }
 93   inline G4String GetParticleName() const over <<  87    inline G4String GetParticleName() const
 94   inline G4double GetCharge() const override { <<  88    { return ParticleName; }
 95   inline G4int GetPDGEncoding() const override <<  89    inline G4double GetCharge() const
 96   inline G4double GetInitialKineticEnergy() co <<  90    { return PDGCharge; }
 97   inline G4ThreeVector GetInitialMomentum() co <<  91    inline G4int GetPDGEncoding() const
                                                   >>  92    { return PDGEncoding; }
                                                   >>  93    inline G4double GetInitialKineticEnergy() const
                                                   >>  94    { return initialKineticEnergy; }
                                                   >>  95    inline G4ThreeVector GetInitialMomentum() const
                                                   >>  96    { return initialMomentum; }
 98                                                    97 
 99   // Other member functions                        98   // Other member functions
100   //                                           <<  99    virtual void ShowTrajectory(std::ostream& os=G4cout) const;
101   void ShowTrajectory(std::ostream& os = G4cou << 100    virtual void DrawTrajectory() const;
102   void DrawTrajectory() const override;        << 101    virtual void AppendStep(const G4Step* aStep);
103   void AppendStep(const G4Step* aStep) overrid << 102    virtual int GetPointEntries() const { return positionRecord->size(); }
104   G4int GetPointEntries() const override { ret << 103    virtual G4VTrajectoryPoint* GetPoint(G4int i) const { return (*positionRecord)[i]; }
105   G4VTrajectoryPoint* GetPoint(G4int i) const  << 104    virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
106   void MergeTrajectory(G4VTrajectory* secondTr << 
107                                                   105 
108   G4ParticleDefinition* GetParticleDefinition( << 106    G4ParticleDefinition* GetParticleDefinition();
109                                                   107 
110   // Get method for HEPRep style attributes       108   // Get method for HEPRep style attributes
111   //                                           << 109    virtual const std::map<G4String,G4AttDef>* GetAttDefs() const;
112   const std::map<G4String, G4AttDef>* GetAttDe << 110    virtual std::vector<G4AttValue>* CreateAttValues() const;
113   std::vector<G4AttValue>* CreateAttValues() c << 111 
114                                                << 112   //---------
115  private:                                      << 113    private:
116   G4TrajectoryPointContainer* positionRecord = << 114   //---------
117   G4int fTrackID = 0;                          << 115 
118   G4int fParentID = 0;                         << 116   TrajectoryPointContainer* positionRecord;
119   G4int PDGEncoding = 0;                       << 117   G4int                     fTrackID;
120   G4double PDGCharge = 0.0;                    << 118   G4int                     fParentID;
121   G4String ParticleName = "";                  << 119   G4int                     PDGEncoding;
122   G4double initialKineticEnergy = 0.0;         << 120   G4double                  PDGCharge;
123   G4ThreeVector initialMomentum;               << 121   G4String                  ParticleName;
                                                   >> 122   G4double                  initialKineticEnergy;
                                                   >> 123   G4ThreeVector             initialMomentum;
124 };                                                124 };
125                                                   125 
126 extern G4TRACKING_DLL G4Allocator<G4SmoothTraj    126 extern G4TRACKING_DLL G4Allocator<G4SmoothTrajectory>*& aSmoothTrajectoryAllocator();
127                                                   127 
128 inline void* G4SmoothTrajectory::operator new(    128 inline void* G4SmoothTrajectory::operator new(size_t)
129 {                                                 129 {
130   if (aSmoothTrajectoryAllocator() == nullptr) << 130   if (!aSmoothTrajectoryAllocator())
131     aSmoothTrajectoryAllocator() = new G4Alloc << 131   { aSmoothTrajectoryAllocator() = new G4Allocator<G4SmoothTrajectory>; }
132   }                                            << 
133   return (void*)aSmoothTrajectoryAllocator()->    132   return (void*)aSmoothTrajectoryAllocator()->MallocSingle();
134 }                                                 133 }
135                                                   134 
136 inline void G4SmoothTrajectory::operator delet    135 inline void G4SmoothTrajectory::operator delete(void* aTrajectory)
137 {                                                 136 {
138   aSmoothTrajectoryAllocator()->FreeSingle((G4    137   aSmoothTrajectoryAllocator()->FreeSingle((G4SmoothTrajectory*)aTrajectory);
139 }                                              << 
140                                                << 
141 inline G4bool G4SmoothTrajectory::operator==(c << 
142 {                                              << 
143   return (this == &r);                         << 
144 }                                                 138 }
145                                                   139 
146 #endif                                            140 #endif
147                                                   141