Changeset 1315 for trunk/source/materials/src/G4AtomicShells.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/materials/src/G4AtomicShells.cc (modified) (8 diffs)

trunk/source/materials/src/G4AtomicShells.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4AtomicShells.cc,v 1.7 2006/10/17 15:15:46 vnivanch Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
+// $Id: G4AtomicShells.cc,v 1.8 2010/04/30 13:09:22 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -34 +34 @@
 // 19-07-04, add a protection in GetNumberOfShells(), mma
 // 11-02-05, GetNumberOfElectrons(Z,ShellNb), V.Ivanchenko
+// 30-04-10, added fIndexOfShells, V.Ivanchenko
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -44 +45 @@
 
 const G4int
-G4AtomicShells::fNumberOfShells[101] =
+G4AtomicShells::fNumberOfShells[101] = 
 {
  0 ,  // nonexisting zero element
@@ -74 +75 @@
 // The total shell number is:
 // 1 + G4AtomicShells::TotalNumberOfShells(100) = 1 + 1539 = 1540 
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
+const G4int    
+G4AtomicShells::fIndexOfShells[101] =
+  {    0,
+       1,    2,    3,    5,    7,   10,   13,   17,   21,   24,  
+      28,   33,   38,   44,   50,   56,   62,   68,   75,   83,  
+      91,  100,  109,  118,  127,  136,  145,  154,  164,  174,  
+     184,  195,  206,  217,  228,  239,  251,  264,  277,  291,  
+     305,  319,  333,  347,  361,  375,  390,  405,  420,  436,  
+     452,  468,  484,  500,  517,  535,  553,  572,  591,  610,  
+     629,  648,  667,  686,  706,  725,  744,  763,  782,  801,  
+     821,  842,  863,  884,  905,  926,  947,  968,  989, 1011,  
+    1033, 1056, 1079, 1102, 1125, 1149, 1173, 1198, 1223, 1249,  
+    1275, 1302, 1329, 1356, 1382, 1408, 1435, 1462, 1488, 1514
+  };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -729 +747 @@
 G4AtomicShells::GetNumberOfShells(G4int Z)  
 {
-  assert (Z>=1 && Z<=101);
+  assert (Z>0 && Z<101);
   return fNumberOfShells[Z];
 }
@@ -738 +756 @@
 G4AtomicShells::GetBindingEnergy(G4int Z, G4int ShellNb)
 {
-  assert (Z>=1 && Z<=101 && ShellNb<fNumberOfShells[Z]);
-  
-  G4int indice = 1;
-  for (G4int z = 1 ; z < Z ; z++) indice += fNumberOfShells[z];
-  indice += ShellNb;  
-  return fBindingEnergies[indice]*eV;
+  assert (Z>0 && Z<101 && ShellNb<fNumberOfShells[Z]);
+  return fBindingEnergies[fIndexOfShells[Z] + ShellNb]*CLHEP::eV;
 }
 
@@ -751 +765 @@
 G4AtomicShells::GetNumberOfElectrons(G4int Z, G4int ShellNb)
 {
-  assert (Z>=1 && Z<=101 && ShellNb<fNumberOfShells[Z]);
-  
-  G4int indice = 1;
-  for (G4int z = 1 ; z < Z ; z++) indice += fNumberOfShells[z];
-  indice += ShellNb;  
-  return fNumberOfElectrons[indice];
+  assert (Z>0 && Z<101 && ShellNb<fNumberOfShells[Z]);
+  return fNumberOfElectrons[fIndexOfShells[Z] + ShellNb];
 }
 
@@ -763 +773 @@
 G4double G4AtomicShells::GetTotalBindingEnergy (G4int Z)
 {
-  assert (Z>=1 && Z<=101);
+  assert (Z>=1 && Z<101);
   
-  G4int idx = 1;
-  for (G4int z = 1 ; z < Z ; z++) idx += fNumberOfShells[z];
+  G4int idx = fIndexOfShells[Z];
+  G4int idxmax = idx +  fNumberOfShells[Z];
   G4double energy = 0.0;
-  G4int idxmax = idx +  fNumberOfShells[Z];
-  for (G4int i=idx; i<idxmax; i++) {energy += fBindingEnergies[i];}
-  return energy*eV;
+  for (G4int i=idx; i<idxmax; ++i) {energy += fBindingEnergies[i];}
+  return energy*CLHEP::eV;
 }