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

Import Geant4 8.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 15:07:44 +02:00
parent fe73f43734
commit 75c7fd177d
764 changed files with 45230 additions and 95238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/materials/src/G4NistElementBuilder.cc
+8 -5
View File
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4NistElementBuilder.cc,v 1.11 2006/10/17 15:15:46 vnivanch Exp $
// GEANT4 tag $Name: geant4-08-02 $
// $Id: G4NistElementBuilder.cc,v 1.13 2007/01/10 18:58:52 vnivanch Exp $
// GEANT4 tag $Name: geant4-08-03 $
//
// -------------------------------------------------------------------
//
@@ -41,6 +41,7 @@
// 11.05.2006 Do not subtract mass of atomic electrons from NIST mass (VI)
// 17.10.2006 Add natiral abandances flag to element and
// use G4 units for isotope mass vector (VI)
// 10.01.2006 Add protection agains Z>101 (VI)
//
// -------------------------------------------------------------------
//
@@ -61,6 +62,8 @@ G4NistElementBuilder::G4NistElementBuilder(G4int vb):
verbose(vb), first(true)
{
Initialise();
// Atomic shells are defined only for 101 elements
limitNumElements = 101;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -81,7 +84,7 @@ G4Element* G4NistElementBuilder::FindOrBuildElement(const G4String& symb,
}
G4int Z = 0;
G4Element* elm = 0;
do {Z++;} while (Z<maxNumElements && !(symb == elmSymbol[Z]));
do {Z++;} while (Z<limitNumElements && !(symb == elmSymbol[Z]));
if(Z<maxNumElements) elm = FindOrBuildElement(Z, buildIsotopes);
return elm;
}
@@ -113,11 +116,12 @@ G4Element* G4NistElementBuilder::FindOrBuildElement(G4int Z,
return anElement;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4Element* G4NistElementBuilder::BuildElement(G4int Z, G4bool buildIsotopes)
{
G4Element* theElement = 0;
if(Z<1 || Z>limitNumElements) return theElement;
G4double Zeff = (G4double)Z;
G4double Aeff = atomicMass[Z];
if (verbose > 1) {
@@ -127,7 +131,6 @@ G4Element* G4NistElementBuilder::BuildElement(G4int Z, G4bool buildIsotopes)
if(buildIsotopes) G4cout << " with natural isotope composition" << G4endl;
else G4cout << " isotopes are not built" << G4endl;
}
G4Element* theElement = 0;
//build Element with its Isotopes
//