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

Import Geant4 5.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:15:15 +02:00
parent 37fff30d2e
commit fbd4999cf7
4396 changed files with 56662 additions and 52446 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/models/radiative_decay/src/G4NuclearDecayChannel.cc
+6 -3
View File
@@ -51,6 +51,7 @@
///////////////////////////////////////////////////////////////////////////////
//
#include "G4NuclearLevelManager.hh"
#include "G4NuclearLevelStore.hh"
#include "G4NuclearDecayChannel.hh"
#include "G4DynamicParticle.hh"
#include "G4DecayProducts.hh"
@@ -204,9 +205,9 @@ void G4NuclearDecayChannel::FillDaughterNucleus (G4int index, G4int A, G4int Z,
//
/*
if (theDaughterExcitation > 0.0) {
G4NuclearLevelManager levelManager = G4NuclearLevelManager(daughterZ, daughterA);
if ( levelManager.NumberOfLevels() ) {
const G4NuclearLevel* level = levelManager.NearestLevel (theDaughterExcitation);
G4NuclearLevelManager * levelManager = G4NuclearLevelStore::GetInstance()->GetManager(daughterZ, daughterA);
if ( levelManager->NumberOfLevels() ) {
const G4NuclearLevel* level = levelManager->NearestLevel (theDaughterExcitation);
daughterExcitation = level->Energy();
@@ -450,6 +451,8 @@ G4DecayProducts *G4NuclearDecayChannel::DecayIt (G4double theParentMass)
//
// now the nucleus
G4double finalDaughterExcitation = gammas->operator[](nGammas)->GetExcitationEnergy();
// f.lei (03/01/03) this is needed to fix the crach in test18
if (finalDaughterExcitation <= 1.0*keV) finalDaughterExcitation = 0 ;
G4IonTable *theIonTable = (G4IonTable*)(G4ParticleTable::GetParticleTable()->GetIonTable());
dynamicDaughter = new G4DynamicParticle
(theIonTable->GetIon(daughterZ,daughterA,finalDaughterExcitation),
source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecay.cc
+5 -4
View File
@@ -95,7 +95,8 @@
#include "G4BetaFermiFunction.hh"
#include "Randomize.hh"
#include "G4LogicalVolumeStore.hh"
#include "G4DiscreteGammaDeexcitation.hh"
#include "G4NuclearLevelManager.hh"
#include "G4NuclearLevelStore.hh"
#include "g4std/vector"
#include "g4std/strstream"
@@ -1066,9 +1067,9 @@ void G4RadioactiveDecay::AddDecayRateTable(const G4ParticleDefinition &theParent
theDaughterNucleus = theNuclearDecayChannel->GetDaughterNucleus () ;
AD = ((const G4Ions*)(theDaughterNucleus))->GetAtomicMass();
ZD = ((const G4Ions*)(theDaughterNucleus))->GetAtomicNumber();
G4NuclearLevelManager levelManager = G4NuclearLevelManager (ZD, AD);
if ( levelManager.NumberOfLevels() ) {
const G4NuclearLevel* level = levelManager.NearestLevel (daughterExcitation);
G4NuclearLevelManager * levelManager = G4NuclearLevelStore::GetInstance()->GetManager (ZD, AD);
if ( levelManager->NumberOfLevels() ) {
const G4NuclearLevel* level = levelManager->NearestLevel (daughterExcitation);
if (abs(daughterExcitation - level->Energy()) < levelTolerance) {