Changeset 1337 for trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08GammaConversionModel.cc

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08GammaConversionModel.cc (modified) (8 diffs)

trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08GammaConversionModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4Penelope08GammaConversionModel.cc,v 1.2 2010/04/23 14:49:46 pandola Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// $Id: G4Penelope08GammaConversionModel.cc,v 1.3 2010/06/25 09:41:17 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // Author: Luciano Pandola
@@ -169 +169 @@
 
   G4double cs = 0;
-  G4double logene = log(energy);
+  G4double logene = std::log(energy);
   G4PhysicsFreeVector* theVec = logAtomicCrossSection->find(iZ)->second;
 
   G4double logXS = theVec->Value(logene);
-  cs = exp(logXS);
+  cs = std::exp(logXS);
 
   if (verboseLevel > 2)
@@ -242 +242 @@
       G4double effC = fEffectiveCharge->find(mat)->second;
       G4double alz = effC*fine_structure_const;
-      G4double T = sqrt(2.0*eki);
+      G4double T = std::sqrt(2.0*eki);
       G4double F00=(-1.774-1.210e1*alz+1.118e1*alz*alz)*T
          +(8.523+7.326e1*alz-4.441e1*alz*alz)*T*T
@@ -269 +269 @@
             G4double  ru2m1 = 2.0*G4UniformRand()-1.0;
             if (ru2m1 < 0)
-              eps = 0.5-xr*pow(std::abs(ru2m1),1./3.);
+              eps = 0.5-xr*std::pow(std::abs(ru2m1),1./3.);
             else
-              eps = 0.5+xr*pow(ru2m1,1./3.);
+              eps = 0.5+xr*std::pow(ru2m1,1./3.);
             G4double B = eki/(invRad*eps*(1.0-eps));
             scree =  GetScreeningFunctions(B);
@@ -457 +457 @@
       if (xs < 1e-40*cm2) //protection against log(0)
         xs = 1e-40*cm2;
-      theVec->PutValue(i,log(ene),log(xs));      
+      theVec->PutValue(i,std::log(ene),std::log(xs));      
     }
   file.close();
@@ -563 +563 @@
 
   std::pair<G4double,G4double> myPair(0,0);
-  G4double f0a = 4.0*log(fAtomicScreeningRadius[intZ-1]);
+  G4double f0a = 4.0*std::log(fAtomicScreeningRadius[intZ-1]);
   G4double f0b = f0a - 4.0*fc;
   myPair.first = f0a;
@@ -596 +596 @@
   std::pair<G4double,G4double> result(0.,0.);
   G4double BSquared = B*B;
-  G4double f1 = 2.0-2.0*log(1.0+BSquared);
+  G4double f1 = 2.0-2.0*std::log(1.0+BSquared);
   G4double f2 = f1 - 6.66666666e-1; // (-2/3)
   if (B < 1.0e-10)
@@ -604 +604 @@
       G4double a0 = 4.0*B*std::atan(1./B);
       f1 = f1 - a0;
-      f2 += 2.0*BSquared*(4.0-a0-3.0*log((1.0+BSquared)/BSquared));
+      f2 += 2.0*BSquared*(4.0-a0-3.0*std::log((1.0+BSquared)/BSquared));
     }
   G4double g1 = 0.5*(3.0*f1-f2);