Changeset 1315 for trunk/source/materials/src/G4IonisParamElm.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/G4IonisParamElm.cc (modified) (6 diffs)

trunk/source/materials/src/G4IonisParamElm.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4IonisParamElm.cc,v 1.15 2008/06/03 14:30:10 vnivanch Exp $
-// GEANT4 tag $Name: materials-V09-02-18 $
-//
-//
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
-//
+// $Id: G4IonisParamElm.cc,v 1.16 2010/04/29 11:11:56 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+//
+//
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+//
+// 09-07-98, data moved from G4Element. M.Maire
+// 22-11-00, tabulation of ionisation potential from 
+//           the ICRU Report N#37. V.Ivanchenko
+// 08-03-01, correct handling of fShellCorrectionVector. M.Maire
+// 17-10-02, Fix excitation energy interpolation. V.Ivanchenko
 // 06-09-04, Update calculated values after any change of ionisation 
 //           potential change. V.Ivanchenko
-// 17-10-02, Fix excitation energy interpolation. V.Ivanchenko
-// 08-03-01, correct handling of fShellCorrectionVector. M.Maire
-// 22-11-00, tabulation of ionisation potential from 
-//           the ICRU Report N#37. V.Ivanchenko
-// 09-07-98, data moved from G4Element. M.Maire
+// 29-04-10, Using G4Pow and mean ionisation energy from NIST V.Ivanchenko
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
 #include "G4IonisParamElm.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
-
-G4IonisParamElm::G4IonisParamElm(G4double Z)
-{
-  if (Z < 1.) 
+#include "G4NistManager.hh"
+#include "G4Pow.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
+
+G4IonisParamElm::G4IonisParamElm(G4double AtomNumber)
+{
+  G4int Z = G4int(AtomNumber + 0.5);
+  if (Z < 1) {
     G4Exception (" ERROR! It is not allowed to create an Element with Z < 1" );
-    
+  }
+  G4Pow* g4pow = G4Pow::GetInstance();
+
   // some basic functions of the atomic number
-  fZ = Z;
-  fZ3  = std::pow(fZ, 1./3.);
-  fZZ3 = std::pow(fZ*(fZ+1.), 1./3.);
-  flogZ3 = std::log(fZ)/3.;
+  fZ     = Z;
+  fZ3    = g4pow->Z13(Z);
+  fZZ3   = fZ3*g4pow->Z13(Z+1);
+  flogZ3 = g4pow->logZ(Z)/3.;
    
   // Parameters for energy loss by ionisation   
-
+  /*
   // Mean excitation energy
   // from "Stopping Powers for Electrons and Positrons"
@@ -73 +79 @@
      9.6,  9.7,  9.7,  9.8,  9.8,  9.8,  9.8,  9.9,  9.9,  9.9 };
 
-  G4int iz = (G4int)Z - 1 ;
-  if(0  > iz) iz = 0;
-  else if(99 < iz) iz = 99 ;
   fMeanExcitationEnergy = fZ * exc[iz] * eV ;
+  */
+
+  fMeanExcitationEnergy = 
+    G4NistManager::Instance()->GetMeanIonisationEnergy(Z);
 
   // compute parameters for ion transport
@@ -85 +92 @@
   // Fast ions or hadrons
 
-  if(91 < iz) iz = 91;
+  G4int iz = Z - 1;
+  if(91 < iz) { iz = 91; }
 
   static G4double vFermi[92] = {
@@ -150 +158 @@
 G4IonisParamElm::G4IonisParamElm(__void__&)
   : fShellCorrectionVector(0)
-{
-}
+{}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -157 +164 @@
 G4IonisParamElm::~G4IonisParamElm()
 {
-  if (fShellCorrectionVector) delete [] fShellCorrectionVector; 
+  if (fShellCorrectionVector) { delete [] fShellCorrectionVector; }
 }
 
@@ -184 +191 @@
       fClow                  = right.fClow;
       fMeanExcitationEnergy  = right.fMeanExcitationEnergy;
-      if (fShellCorrectionVector) delete [] fShellCorrectionVector;             
+      if (fShellCorrectionVector) { delete [] fShellCorrectionVector; } 
       fShellCorrectionVector = new G4double[3];            
       fShellCorrectionVector[0] = right.fShellCorrectionVector[0];