Import Geant4 10.6.1 source tree

This commit is contained in:
Gabriele Cosmo
2020-02-14 15:32:52 +01:00
parent 5baee230e9
commit 8c87fe78c4
278 changed files with 24232 additions and 22963 deletions
@@ -167,17 +167,18 @@ G4ParticleDefinition* G4DecayTableMessenger::SetCurrentParticle()
currentParticle = theParticleTable->FindParticle(particleName);
idxCurrentChannel = -1;
currentDecayTable = nullptr;
if (currentParticle != nullptr ){
currentDecayTable = currentParticle->GetDecayTable();
if ((currentDecayTable != nullptr ) && (idxCurrentChannel >0) ) {
currentChannel = currentDecayTable->GetDecayChannel(idxCurrentChannel);
} else {
idxCurrentChannel = -1;
currentChannel = nullptr;
}
}
}
if (currentParticle != nullptr ){
currentDecayTable = currentParticle->GetDecayTable();
if ((currentDecayTable != nullptr ) && (idxCurrentChannel >0) ) {
currentChannel = currentDecayTable->GetDecayChannel(idxCurrentChannel);
} else {
idxCurrentChannel = -1;
currentChannel = nullptr;
}
}
return currentParticle;
}