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

Import Geant4 10.7.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tracking/src/G4RichTrajectory.cc
+83 -63
View File
@@ -23,23 +23,18 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
//
// ---------------------------------------------------------------
//
// G4RichTrajectory.cc
// G4RichTrajectory class implementation
//
// Contact:
// Questions and comments on G4Trajectory, on which this is based,
// should be sent to
// Katsuya Amako (e-mail: Katsuya.Amako@kek.jp)
// Makoto Asai (e-mail: asai@kekvax.kek.jp)
// Makoto Asai (e-mail: asai@slac.stanford.edu)
// Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
// and on the extended code to:
// John Allison (e-mail: John.Allison@manchester.ac.uk)
// Joseph Perl (e-mail: perl@slac.stanford.edu)
//
// ---------------------------------------------------------------
// --------------------------------------------------------------------
#include "G4RichTrajectory.hh"
#include "G4RichTrajectoryPoint.hh"
@@ -59,46 +54,45 @@
G4Allocator<G4RichTrajectory>*& aRichTrajectoryAllocator()
{
G4ThreadLocalStatic G4Allocator<G4RichTrajectory>* _instance = nullptr;
return _instance;
G4ThreadLocalStatic G4Allocator<G4RichTrajectory>* _instance = nullptr;
return _instance;
}
G4RichTrajectory::G4RichTrajectory():
fpRichPointsContainer(0),
fpCreatorProcess(0),
fCreatorModelID(0),
fpEndingProcess(0),
fFinalKineticEnergy(0.)
G4RichTrajectory::G4RichTrajectory()
{
}
G4RichTrajectory::G4RichTrajectory(const G4Track* aTrack):
G4Trajectory(aTrack) // Note: this initialises the base class data
// members and, unfortunately but never mind,
// creates a G4TrajectoryPoint in
// TrajectoryPointContainer that we cannot
// access because it's private. We store the
// same information (plus more) in a
// G4RichTrajectoryPoint in the
// RichTrajectoryPointsContainer
G4RichTrajectory::G4RichTrajectory(const G4Track* aTrack)
: G4Trajectory(aTrack) // Note: this initialises the base class data
// members and, unfortunately but never mind,
// creates a G4TrajectoryPoint in
// TrajectoryPointContainer that we cannot
// access because it's private. We store the
// same information (plus more) in a
// G4RichTrajectoryPoint in the
// RichTrajectoryPointsContainer
{
fpInitialVolume = aTrack->GetTouchableHandle();
fpInitialNextVolume = aTrack->GetNextTouchableHandle();
fpCreatorProcess = aTrack->GetCreatorProcess();
fCreatorModelID = aTrack->GetCreatorModelID();
// On construction, set final values to initial values.
// Final values are updated at the addition of every step - see AppendStep.
//
fpFinalVolume = aTrack->GetTouchableHandle();
fpFinalNextVolume = aTrack->GetNextTouchableHandle();
fpEndingProcess = aTrack->GetCreatorProcess();
fFinalKineticEnergy = aTrack->GetKineticEnergy();
// Insert the first rich trajectory point (see note above)...
//
fpRichPointsContainer = new RichTrajectoryPointsContainer;
fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aTrack));
}
G4RichTrajectory::G4RichTrajectory(G4RichTrajectory & right):
G4Trajectory(right)
G4RichTrajectory::G4RichTrajectory(G4RichTrajectory& right)
: G4Trajectory(right)
{
fpInitialVolume = right.fpInitialVolume;
fpInitialNextVolume = right.fpInitialNextVolume;
@@ -109,7 +103,7 @@ G4RichTrajectory::G4RichTrajectory(G4RichTrajectory & right):
fpEndingProcess = right.fpEndingProcess;
fFinalKineticEnergy = right.fFinalKineticEnergy;
fpRichPointsContainer = new RichTrajectoryPointsContainer;
for(size_t i=0;i<right.fpRichPointsContainer->size();i++)
for(std::size_t i=0; i<right.fpRichPointsContainer->size(); ++i)
{
G4RichTrajectoryPoint* rightPoint =
(G4RichTrajectoryPoint*)((*(right.fpRichPointsContainer))[i]);
@@ -119,10 +113,10 @@ G4RichTrajectory::G4RichTrajectory(G4RichTrajectory & right):
G4RichTrajectory::~G4RichTrajectory()
{
if (fpRichPointsContainer) {
// fpRichPointsContainer->clearAndDestroy();
size_t i;
for(i=0;i<fpRichPointsContainer->size();i++){
if (fpRichPointsContainer)
{
for(std::size_t i=0; i<fpRichPointsContainer->size(); ++i)
{
delete (*fpRichPointsContainer)[i];
}
fpRichPointsContainer->clear();
@@ -133,30 +127,33 @@ G4RichTrajectory::~G4RichTrajectory()
void G4RichTrajectory::AppendStep(const G4Step* aStep)
{
fpRichPointsContainer->push_back(new G4RichTrajectoryPoint(aStep));
// Except for first step, which is a sort of virtual step to start
// the track, compute the final values...
//
const G4Track* track = aStep->GetTrack();
const G4StepPoint* postStepPoint = aStep->GetPostStepPoint();
if (track->GetCurrentStepNumber() > 0) {
if (track->GetCurrentStepNumber() > 0)
{
fpFinalVolume = track->GetTouchableHandle();
fpFinalNextVolume = track->GetNextTouchableHandle();
fpEndingProcess = postStepPoint->GetProcessDefinedStep();
fFinalKineticEnergy =
aStep->GetPreStepPoint()->GetKineticEnergy() -
aStep->GetTotalEnergyDeposit();
fFinalKineticEnergy = aStep->GetPreStepPoint()->GetKineticEnergy()
- aStep->GetTotalEnergyDeposit();
}
}
void G4RichTrajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
{
if(!secondTrajectory) return;
if(secondTrajectory == nullptr) return;
G4RichTrajectory* seco = (G4RichTrajectory*)secondTrajectory;
G4int ent = seco->GetPointEntries();
for(G4int i=1;i<ent;i++) {
for(G4int i=1; i<ent; ++i)
{
// initial point of the second trajectory should not be merged
//
fpRichPointsContainer->push_back((*(seco->fpRichPointsContainer))[i]);
// fpRichPointsContainer->push_back(seco->fpRichPointsContainer->removeAt(1));
}
delete (*seco->fpRichPointsContainer)[0];
seco->fpRichPointsContainer->clear();
@@ -165,14 +162,18 @@ void G4RichTrajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
void G4RichTrajectory::ShowTrajectory(std::ostream& os) const
{
// Invoke the default implementation in G4VTrajectory...
//
G4VTrajectory::ShowTrajectory(os);
// ... or override with your own code here.
}
void G4RichTrajectory::DrawTrajectory() const
{
// Invoke the default implementation in G4VTrajectory...
//
G4VTrajectory::DrawTrajectory();
// ... or override with your own code here.
}
@@ -181,20 +182,21 @@ const std::map<G4String,G4AttDef>* G4RichTrajectory::GetAttDefs() const
G4bool isNew;
std::map<G4String,G4AttDef>* store
= G4AttDefStore::GetInstance("G4RichTrajectory",isNew);
if (isNew) {
if (isNew)
{
// Get att defs from base class...
//
*store = *(G4Trajectory::GetAttDefs());
G4String ID;
ID = "IVPath";
(*store)[ID] = G4AttDef(ID,"Initial Volume Path",
"Physics","","G4String");
"Physics","","G4String");
ID = "INVPath";
(*store)[ID] = G4AttDef(ID,"Initial Next Volume Path",
"Physics","","G4String");
"Physics","","G4String");
ID = "CPN";
(*store)[ID] = G4AttDef(ID,"Creator Process Name",
@@ -214,24 +216,23 @@ const std::map<G4String,G4AttDef>* G4RichTrajectory::GetAttDefs() const
ID = "FVPath";
(*store)[ID] = G4AttDef(ID,"Final Volume Path",
"Physics","","G4String");
"Physics","","G4String");
ID = "FNVPath";
(*store)[ID] = G4AttDef(ID,"Final Next Volume Path",
"Physics","","G4String");
"Physics","","G4String");
ID = "EPN";
(*store)[ID] = G4AttDef(ID,"Ending Process Name",
"Physics","","G4String");
"Physics","","G4String");
ID = "EPTN";
(*store)[ID] = G4AttDef(ID,"Ending Process Type Name",
"Physics","","G4String");
"Physics","","G4String");
ID = "FKE";
(*store)[ID] = G4AttDef(ID,"Final kinetic energy",
"Physics","G4BestUnit","G4double");
"Physics","G4BestUnit","G4double");
}
return store;
@@ -241,9 +242,10 @@ static G4String Path(const G4TouchableHandle& th)
{
std::ostringstream oss;
G4int depth = th->GetHistoryDepth();
for (G4int i = depth; i >= 0; --i) {
for (G4int i = depth; i >= 0; --i)
{
oss << th->GetVolume(i)->GetName()
<< ':' << th->GetCopyNumber(i);
<< ':' << th->GetCopyNumber(i);
if (i != 0) oss << '/';
}
return oss.str();
@@ -254,19 +256,26 @@ std::vector<G4AttValue>* G4RichTrajectory::CreateAttValues() const
// Create base class att values...
std::vector<G4AttValue>* values = G4Trajectory::CreateAttValues();
if (fpInitialVolume && fpInitialVolume->GetVolume()) {
if (fpInitialVolume && fpInitialVolume->GetVolume())
{
values->push_back(G4AttValue("IVPath",Path(fpInitialVolume),""));
} else {
}
else
{
values->push_back(G4AttValue("IVPath","None",""));
}
if (fpInitialNextVolume && fpInitialNextVolume->GetVolume()) {
if (fpInitialNextVolume && fpInitialNextVolume->GetVolume())
{
values->push_back(G4AttValue("INVPath",Path(fpInitialNextVolume),""));
} else {
}
else
{
values->push_back(G4AttValue("INVPath","None",""));
}
if (fpCreatorProcess) {
if (fpCreatorProcess != nullptr)
{
values->push_back
(G4AttValue("CPN",fpCreatorProcess->GetProcessName(),""));
G4ProcessType type = fpCreatorProcess->GetProcessType();
@@ -277,30 +286,41 @@ std::vector<G4AttValue>* G4RichTrajectory::CreateAttValues() const
const G4String& creatorModelName =
G4PhysicsModelCatalog::GetModelName(fCreatorModelID);
values->push_back(G4AttValue("CMN",creatorModelName,""));
} else {
}
else
{
values->push_back(G4AttValue("CPN","None",""));
values->push_back(G4AttValue("CPTN","None",""));
values->push_back(G4AttValue("CMID","None",""));
values->push_back(G4AttValue("CMN","None",""));
}
if (fpFinalVolume && fpFinalVolume->GetVolume()) {
if (fpFinalVolume && fpFinalVolume->GetVolume())
{
values->push_back(G4AttValue("FVPath",Path(fpFinalVolume),""));
} else {
}
else
{
values->push_back(G4AttValue("FVPath","None",""));
}
if (fpFinalNextVolume && fpFinalNextVolume->GetVolume()) {
if (fpFinalNextVolume && fpFinalNextVolume->GetVolume())
{
values->push_back(G4AttValue("FNVPath",Path(fpFinalNextVolume),""));
} else {
}
else
{
values->push_back(G4AttValue("FNVPath","None",""));
}
if (fpEndingProcess) {
if (fpEndingProcess != nullptr)
{
values->push_back(G4AttValue("EPN",fpEndingProcess->GetProcessName(),""));
G4ProcessType type = fpEndingProcess->GetProcessType();
values->push_back(G4AttValue("EPTN",G4VProcess::GetProcessTypeName(type),""));
} else {
}
else
{
values->push_back(G4AttValue("EPN","None",""));
values->push_back(G4AttValue("EPTN","None",""));
}