Changeset 1337 for trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08RayleighModel.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/G4Penelope08RayleighModel.cc (modified) (12 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4Penelope08RayleighModel.cc,v 1.1 2010/03/17 14:18:50 pandola Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// $Id: G4Penelope08RayleighModel.cc,v 1.2 2010/06/25 09:41:28 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // Author: Luciano Pandola
@@ -69 +69 @@
 
   //build the energy grid. It is the same for all materials
-  G4double logenergy = log(fIntrinsicLowEnergyLimit/2.);
-  G4double logmaxenergy = log(1.5*fIntrinsicHighEnergyLimit);
+  G4double logenergy = std::log(fIntrinsicLowEnergyLimit/2.);
+  G4double logmaxenergy = std::log(1.5*fIntrinsicHighEnergyLimit);
   //finer grid below 160 keV
-  G4double logtransitionenergy = log(160*keV); 
-  G4double logfactor1 = log(10.)/250.;
+  G4double logtransitionenergy = std::log(160*keV); 
+  G4double logfactor1 = std::log(10.)/250.;
   G4double logfactor2 = logfactor1*10;
   logEnergyGridPMax.push_back(logenergy);
@@ -219 +219 @@
        G4Exception();
      }
-   G4double logene = log(energy);
+   G4double logene = std::log(energy);
    G4double logXS = atom->Value(logene);
-   cross = exp(logXS);
+   cross = std::exp(logXS);
 
    if (verboseLevel > 2)
@@ -288 +288 @@
         }
       if (ff2)
-        theFFVec->PutValue(k,logQSquareGrid[k],log(ff2)); //NOTICE: THIS IS log(Q^2) vs. log(F^2)
+        theFFVec->PutValue(k,logQSquareGrid[k],std::log(ff2)); //NOTICE: THIS IS log(Q^2) vs. log(F^2)
     }
   logFormFactorTable->insert(std::make_pair(material,theFFVec));
@@ -468 +468 @@
       ene *= eV;
       xs *= cm2;
-      theVec->PutValue(i,log(ene),log(xs));
+      theVec->PutValue(i,std::log(ene),std::log(xs));
       if (file.eof() && i != (nPoints-1)) //file ended too early
         {
@@ -521 +521 @@
       if (fillQGrid)
         {
-          logQSquareGrid.push_back(2.0*log(q));
+          logQSquareGrid.push_back(2.0*std::log(q));
         }
       if (file.eof() && i != (nPoints-1)) //file ended too early
@@ -547 +547 @@
 {
   G4double f2 = 0;
-  G4double logQSquared = log(QSquared);
+  G4double logQSquared = std::log(QSquared);
   //last value of the table
   G4double maxlogQ2 = logQSquareGrid[logQSquareGrid.size()-1];
@@ -566 +566 @@
     {
       G4double logf2 = (*theVec)[0]; //first value of the table
-      f2 = exp(logf2);
+      f2 = std::exp(logf2);
     }
   else if (logQSquared > maxlogQ2)
@@ -574 +574 @@
       //log(Q^2) vs. log(F^2)
       G4double logf2 = theVec->Value(logQSquared);
-      f2 = exp(logf2);
+      f2 = std::exp(logf2);
 
     }
@@ -594 +594 @@
   for (size_t i=1;i<logQSquareGrid.size();i++)
     {
-      G4double Q2 = exp(logQSquareGrid[i]);
+      G4double Q2 = std::exp(logQSquareGrid[i]);
       if (GetFSquared(mat,Q2) >  1e-35)
         {
-          q2max = exp(logQSquareGrid[i-1]);
+          q2max = std::exp(logQSquareGrid[i-1]);
         }
     }
@@ -1043 +1043 @@
   for (size_t ie=0;ie<logEnergyGridPMax.size();ie++)
     {
-      G4double energy = exp(logEnergyGridPMax[ie]);
+      G4double energy = std::exp(logEnergyGridPMax[ie]);
       G4double Qm = 2.0*energy/electron_mass_c2; //this is non-dimensional now
       G4double Qm2 = Qm*Qm;
@@ -1148 +1148 @@
     {
       G4double logQ2 = theVec->GetLowEdgeEnergy(i);
-      G4double Q = exp(0.5*logQ2);
+      G4double Q = std::exp(0.5*logQ2);
       G4double logF2 = (*theVec)[i];
-      G4double F = exp(0.5*logF2);
+      G4double F = std::exp(0.5*logF2);
       G4cout << Q << "              " << F << G4endl;
     }