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

Import Geant4 11.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-12-10 14:46:44 +01:00
committed by Ben Morgan
parent 6399a014b6
commit 80e2389dd8
3932 changed files with 202519 additions and 246221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/stopping/src/G4ElementSelector.cc
+4 -4
View File
@@ -55,7 +55,7 @@ G4ElementSelector::~G4ElementSelector()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
G4Element*
const G4Element*
G4ElementSelector::SelectZandA(const G4Track& track, G4Nucleus* target)
{
// Fermi-Teller Z-low of mu- capture and exceptions
@@ -75,7 +75,7 @@ G4ElementSelector::SelectZandA(const G4Track& track, G4Nucleus* target)
G4double sum = 0.0;
for (i=0; i < numberOfElements; ++i) {
G4int Z = G4lrint((*theElementVector)[i]->GetZ());
G4int Z = (*theElementVector)[i]->GetZasInt();
// Halogens
if( (9 == Z) || (17 == Z) || (35 == Z) || (53 == Z) || (85 == Z) ) {
@@ -98,8 +98,8 @@ G4ElementSelector::SelectZandA(const G4Track& track, G4Nucleus* target)
}
}
G4Element* elm = (*theElementVector)[i];
G4int Z = G4lrint(elm->GetZ());
const G4Element* elm = (*theElementVector)[i];
G4int Z = elm->GetZasInt();
// select isotope
const G4IsotopeVector* isv = elm->GetIsotopeVector();
source/processes/hadronic/stopping/src/G4HadronStoppingProcess.cc
+8 -8
View File
@@ -98,9 +98,9 @@ void
G4HadronStoppingProcess::PreparePhysicsTable(const G4ParticleDefinition& p)
{
G4HadronicProcessStore::Instance()->RegisterParticleForExtraProcess(this,&p);
emcID = G4PhysicsModelCatalog::Register(G4String((GetProcessName() + "_EMCascade")));
ncID = G4PhysicsModelCatalog::Register(G4String((GetProcessName() + "_NuclearCapture")));
dioID = G4PhysicsModelCatalog::Register(G4String((GetProcessName() + "_DIO")));
emcID = G4PhysicsModelCatalog::GetModelID(G4String("model_" + (GetProcessName() + "_EMCascade")));
ncID = G4PhysicsModelCatalog::GetModelID(G4String("model_" + (GetProcessName() + "_NuclearCapture")));
dioID = G4PhysicsModelCatalog::GetModelID(G4String("model_" + (GetProcessName() + "_DIO")));
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -137,7 +137,7 @@ G4VParticleChange* G4HadronStoppingProcess::AtRestDoIt(const G4Track& track,
theTotalResult->Initialize(track);
G4Nucleus* nucleus = GetTargetNucleusPointer();
G4Element* elm = fElementSelector->SelectZandA(track, nucleus);
const G4Element* elm = fElementSelector->SelectZandA(track, nucleus);
G4HadFinalState* result = 0;
thePro.Initialise(track);
@@ -275,13 +275,13 @@ G4VParticleChange* G4HadronStoppingProcess::AtRestDoIt(const G4Track& track,
track.GetPosition());
t->SetWeight(w*sec->GetWeight());
// use SetCreatorModelIndex to "label" the track
// use SetCreatorModelID to "label" the track
if (i<nEmCascadeSec) {
t->SetCreatorModelIndex(emcID);
t->SetCreatorModelID(emcID);
} else if (nuclearCapture) {
t->SetCreatorModelIndex(ncID);
t->SetCreatorModelID(ncID);
} else {
t->SetCreatorModelIndex(dioID);
t->SetCreatorModelID(dioID);
}
t->SetTouchableHandle(track.GetTouchableHandle());
source/processes/hadronic/stopping/src/G4MuonicAtomDecay.cc
+1 -1
View File
@@ -520,7 +520,7 @@ void G4MuonicAtomDecay::FillResult(G4HadFinalState * aR, const G4Track & aT)
G4Track* track = new G4Track(aR->GetSecondary(i)->GetParticle(),
time, aT.GetPosition());
track->SetCreatorModelIndex(aR->GetSecondary(i)->GetCreatorModelType());
track->SetCreatorModelID(aR->GetSecondary(i)->GetCreatorModelID());
G4double newWeight = weight*aR->GetSecondary(i)->GetWeight();
// G4cout << "#### ParticleDebug "
// <<GetProcessName()<<" "