Import Geant4 5.1.0 source tree

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
@@ -22,7 +22,7 @@
//
//
// $Id: G4AtomicTransitionManager.cc,v 1.2 ????
// GEANT4 tag $Name: geant4-05-00 $
// GEANT4 tag $Name: geant4-05-01 $
//
// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
// Alfonso Mantero (Alfonso.Mantero@ge.infn.it)
@@ -173,24 +173,35 @@ G4AtomicShell* G4AtomicTransitionManager::Shell(G4int Z, size_t shellIndex) cons
pos = shellTable.find(Z);
if (pos!= shellTable.end()){
G4std::vector<G4AtomicShell*> v = (*pos).second;
if (shellIndex<v.size()){
return(v[shellIndex]);
if (pos!= shellTable.end())
{
G4std::vector<G4AtomicShell*> v = (*pos).second;
if (shellIndex<v.size())
{
return(v[shellIndex]);
}
else
{
size_t lastShell = v.size();
G4cout << "G4AtomicTransitionManager::Shell - Z = "
<< Z << ", shellIndex = " << shellIndex
<< " not found; number of shells = " << lastShell << G4endl;
// G4Exception("G4AtomicTransitionManager:shell not found");
if (lastShell > 0)
{
return v[lastShell - 1];
}
else
{
return 0;
}
}
}
else {
G4Exception("G4AtomicTransitionManager:shell not found");
else
{
G4Exception("G4AtomicTransitionManager:Z not found");
return 0;
}
}
else{
G4Exception("G4AtomicTransitionManager:Z not found");
return 0;
}
}
}
// This function gives, upon Z and the Index of the initial shell where te vacancy is,