lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/History
+3
View File
@@ -16,6 +16,9 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Nov 26, 2019, G.Cosmo (tracking-V10-05-02)
- Fixed cases of implicit type conversions from size_t to G4int.
Mar 11, 2019, G.Cosmo (tracking-V10-05-01)
- Fixed typos in printouts and comments.
source/tracking/include/G4RichTrajectory.hh
+41 -51
View File
@@ -23,13 +23,10 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
//---------------------------------------------------------------
//
// G4RichTrajectory.hh
// G4RichTrajectory
//
// class description:
//
// This class extends G4Trajectory, which includes the following:
// 1) List of trajectory points which compose the trajectory,
// 2) static information of particle which generated the
@@ -40,7 +37,7 @@
// 4) physical volume and next physical volume;
// 5) creator process;
// ...and much more.
//
// Contact:
// Questions and comments on G4Trajectory should be sent to
// Katsuya Amako (e-mail: Katsuya.Amako@kek.jp)
@@ -49,9 +46,7 @@
// and on the extended code to:
// John Allison (e-mail: John.Allison@manchester.ac.uk)
// Joseph Perl (e-mail: perl@slac.stanford.edu)
//
// ---------------------------------------------------------------
// --------------------------------------------------------------------
#ifndef G4RICHTRAJECTORY_HH
#define G4RICHTRAJECTORY_HH
@@ -59,54 +54,49 @@
#include "G4Trajectory.hh"
#include "G4TouchableHandle.hh"
typedef std::vector<G4VTrajectoryPoint*> RichTrajectoryPointsContainer;
class G4RichTrajectory : public G4Trajectory
{
using RichTrajectoryPointsContainer = std::vector<G4VTrajectoryPoint*>;
class G4RichTrajectory : public G4Trajectory {
public: // with description
public: // with description
// Constructors/destructor
G4RichTrajectory();
G4RichTrajectory(const G4Track* aTrack);
G4RichTrajectory(G4RichTrajectory &);
virtual ~G4RichTrajectory();
// Operators
G4RichTrajectory& operator= (const G4RichTrajectory &) = delete;
G4int operator == (const G4RichTrajectory& r) const { return (this==&r); }
inline void* operator new(size_t);
inline void operator delete(void*);
// Constructors/destructors
G4RichTrajectory();
G4RichTrajectory(const G4Track* aTrack);
G4RichTrajectory(G4RichTrajectory &);
virtual ~G4RichTrajectory();
// Other (virtual) member functions
void ShowTrajectory(std::ostream& os=G4cout) const;
void DrawTrajectory() const;
void AppendStep(const G4Step* aStep);
void MergeTrajectory(G4VTrajectory* secondTrajectory);
G4int GetPointEntries() const {return G4int(fpRichPointsContainer->size());}
G4VTrajectoryPoint* GetPoint(G4int i) const {return (*fpRichPointsContainer)[i];}
private:
G4RichTrajectory& operator= (const G4RichTrajectory &);
// Get methods for HepRep style attributes
virtual const std::map<G4String, G4AttDef>* GetAttDefs() const;
virtual std::vector<G4AttValue>* CreateAttValues() const;
// Operators
public:
inline void* operator new(size_t);
inline void operator delete(void*);
inline int operator == (const G4RichTrajectory& right) const
{return (this==&right);}
// Other (virtual) member functions
void ShowTrajectory(std::ostream& os=G4cout) const;
void DrawTrajectory() const;
void AppendStep(const G4Step* aStep);
void MergeTrajectory(G4VTrajectory* secondTrajectory);
int GetPointEntries() const { return fpRichPointsContainer->size(); }
G4VTrajectoryPoint* GetPoint(G4int i) const
{ return (*fpRichPointsContainer)[i]; }
// Get methods for HepRep style attributes
virtual const std::map<G4String,G4AttDef>* GetAttDefs() const;
virtual std::vector<G4AttValue>* CreateAttValues() const;
private:
// Extended information (only publicly accessible through AttValues)...
RichTrajectoryPointsContainer* fpRichPointsContainer;
G4TouchableHandle fpInitialVolume;
G4TouchableHandle fpInitialNextVolume;
const G4VProcess* fpCreatorProcess;
G4int fCreatorModelID;
G4TouchableHandle fpFinalVolume;
G4TouchableHandle fpFinalNextVolume;
const G4VProcess* fpEndingProcess;
G4double fFinalKineticEnergy;
private:
// Extended information (only publicly accessible through AttValues)...
RichTrajectoryPointsContainer* fpRichPointsContainer;
G4TouchableHandle fpInitialVolume;
G4TouchableHandle fpInitialNextVolume;
const G4VProcess* fpCreatorProcess;
G4int fCreatorModelID;
G4TouchableHandle fpFinalVolume;
G4TouchableHandle fpFinalNextVolume;
const G4VProcess* fpEndingProcess;
G4double fFinalKineticEnergy;
};
extern G4TRACKING_DLL G4Allocator<G4RichTrajectory>*& aRichTrajectoryAllocator();
source/tracking/include/G4SmoothTrajectory.hh
+22 -33
View File
@@ -23,13 +23,10 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
//---------------------------------------------------------------
//
// G4SmoothTrajectory.hh
// G4SmoothTrajectory
//
// class description:
//
// This class represents the trajectory of a particle tracked.
// It includes information of
// 1) List of trajectory points which compose the trajectory,
@@ -38,13 +35,10 @@
// 3) trackID and parent particle ID of the trajectory,
// 4) Auxiliary points will be associated to G4SmoothTrajectoryPoint
// to assist drawing smoothly curved trajectory.
//
// ---------------------------------------------------------------
class G4SmoothTrajectory;
#ifndef G4SmoothTrajectory_h
#define G4SmoothTrajectory_h 1
// --------------------------------------------------------------------
#ifndef G4SmoothTrajectory_hh
#define G4SmoothTrajectory_hh 1
#include <stdlib.h> // Include from 'system'
#include <vector>
@@ -59,36 +53,33 @@ class G4SmoothTrajectory;
#include "G4Track.hh"
#include "G4Step.hh"
class G4Polyline; // Forward declaration
typedef std::vector<G4VTrajectoryPoint*> TrajectoryPointContainer;
class G4Polyline;
class G4SmoothTrajectory : public G4VTrajectory
{
//--------
public: // with description
//--------
using TrajectoryPointContainer = std::vector<G4VTrajectoryPoint*>;
// Constructor/Destrcutor
//--------
public: // with description
//--------
// Constructor/Destructor
G4SmoothTrajectory();
G4SmoothTrajectory(const G4Track* aTrack);
G4SmoothTrajectory(G4SmoothTrajectory &);
virtual ~G4SmoothTrajectory();
private:
G4SmoothTrajectory& operator= (const G4SmoothTrajectory&);
// Operators
G4SmoothTrajectory& operator= (const G4SmoothTrajectory&) = delete;
G4int operator == (const G4SmoothTrajectory& r) const {return (this==&r);}
// Operators
public:
inline void* operator new(size_t);
inline void operator delete(void*);
inline int operator == (const G4SmoothTrajectory& right) const
{return (this==&right);}
// Get/Set functions
// Get/Set functions
inline G4int GetTrackID() const
{ return fTrackID; }
inline G4int GetParentID() const
@@ -104,24 +95,23 @@ public:
inline G4ThreeVector GetInitialMomentum() const
{ return initialMomentum; }
// Other member functions
// Other member functions
virtual void ShowTrajectory(std::ostream& os=G4cout) const;
virtual void DrawTrajectory() const;
virtual void AppendStep(const G4Step* aStep);
virtual int GetPointEntries() const { return positionRecord->size(); }
virtual G4VTrajectoryPoint* GetPoint(G4int i) const
{ return (*positionRecord)[i]; }
virtual G4VTrajectoryPoint* GetPoint(G4int i) const { return (*positionRecord)[i]; }
virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
G4ParticleDefinition* GetParticleDefinition();
// Get method for HEPRep style attributes
// Get method for HEPRep style attributes
virtual const std::map<G4String,G4AttDef>* GetAttDefs() const;
virtual std::vector<G4AttValue>* CreateAttValues() const;
//---------
//---------
private:
//---------
//---------
TrajectoryPointContainer* positionRecord;
G4int fTrackID;
@@ -131,7 +121,6 @@ public:
G4String ParticleName;
G4double initialKineticEnergy;
G4ThreeVector initialMomentum;
};
extern G4TRACKING_DLL G4Allocator<G4SmoothTrajectory>*& aSmoothTrajectoryAllocator();
source/tracking/include/G4Trajectory.hh
+24 -31
View File
@@ -23,11 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
//---------------------------------------------------------------
//
// G4Trajectory.hh
// G4Trajectory
//
// class description:
// This class represents the trajectory of a particle tracked.
@@ -36,19 +32,16 @@
// 2) static information of particle which generated the
// trajectory,
// 3) trackID and parent particle ID of the trajectory,
//
// Contact:
// Questions and comments to this code should be sent to
// Katsuya Amako (e-mail: Katsuya.Amako@kek.jp)
// Makoto Asai (e-mail: asai@kekvax.kek.jp)
// Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
//
// ---------------------------------------------------------------
class G4Trajectory;
#ifndef G4Trajectory_h
#define G4Trajectory_h 1
// --------------------------------------------------------------------
#ifndef G4Trajectory_hh
#define G4Trajectory_hh 1
#include <stdlib.h> // Include from 'system'
#include <vector>
@@ -63,34 +56,34 @@ class G4Trajectory;
#include "G4Track.hh"
#include "G4Step.hh"
class G4Polyline; // Forward declaration
typedef std::vector<G4VTrajectoryPoint*> TrajectoryPointContainer;
class G4Polyline;
///////////////////
class G4Trajectory : public G4VTrajectory
///////////////////
{
//--------
public: // with description
//--------
using TrajectoryPointContainer = std::vector<G4VTrajectoryPoint*>;
// Constructor/Destrcutor
//--------
public: // with description
//--------
// Constructor/Destructor
G4Trajectory();
G4Trajectory(const G4Track* aTrack);
G4Trajectory(G4Trajectory &);
virtual ~G4Trajectory();
// Operators
// Operators
inline void* operator new(size_t);
inline void operator delete(void*);
inline int operator == (const G4Trajectory& right) const
{return (this==&right);}
G4int operator == (const G4Trajectory& r) const {return (this==&r);}
// Get/Set functions
// Get/Set functions
inline G4int GetTrackID() const
{ return fTrackID; }
inline G4int GetParentID() const
@@ -106,13 +99,13 @@ public: // with description
inline G4ThreeVector GetInitialMomentum() const
{ return initialMomentum; }
// Other member functions
// Other member functions
virtual void ShowTrajectory(std::ostream& os=G4cout) const;
virtual void DrawTrajectory() const;
virtual void AppendStep(const G4Step* aStep);
virtual int GetPointEntries() const { return positionRecord->size(); }
virtual G4VTrajectoryPoint* GetPoint(G4int i) const
{ return (*positionRecord)[i]; }
virtual G4int GetPointEntries() const {return G4int(positionRecord->size());}
virtual G4VTrajectoryPoint* GetPoint(G4int i) const { return (*positionRecord)[i]; }
virtual void MergeTrajectory(G4VTrajectory* secondTrajectory);
G4ParticleDefinition* GetParticleDefinition();
@@ -120,9 +113,9 @@ public: // with description
virtual const std::map<G4String,G4AttDef>* GetAttDefs() const;
virtual std::vector<G4AttValue>* CreateAttValues() const;
//---------
private:
//---------
//---------
private:
//---------
TrajectoryPointContainer* positionRecord;
G4int fTrackID;