Changeset 1337 for trunk/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.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/xrays/src/G4VXTRenergyLoss.cc (modified) (25 diffs)

trunk/source/processes/electromagnetic/xrays/src/G4VXTRenergyLoss.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VXTRenergyLoss.cc,v 1.44 2007/09/29 17:49:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VXTRenergyLoss.cc,v 1.45 2010/06/16 15:34:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // History:
@@ -54 +54 @@
 #include "G4PhysicsFreeVector.hh"
 #include "G4PhysicsLinearVector.hh"
-
-using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////
@@ -142 +140 @@
   //  fSigma1 = (20.9*eV)*(20.9*eV) ;
   if(verboseLevel > 0)
-    G4cout<<"plate plasma energy = "<<sqrt(fSigma1)/eV<<" eV"<<G4endl ;
+    G4cout<<"plate plasma energy = "<<std::sqrt(fSigma1)/eV<<" eV"<<G4endl ;
 
   // plasma energy squared for gas material
@@ -148 +146 @@
   fSigma2 = fPlasmaCof*gasMat->GetElectronDensity()  ;
   if(verboseLevel > 0)
-    G4cout<<"gas plasma energy = "<<sqrt(fSigma2)/eV<<" eV"<<G4endl ;
+    G4cout<<"gas plasma energy = "<<std::sqrt(fSigma2)/eV<<" eV"<<G4endl ;
 
   // Compute cofs for preparation of linear photo absorption
@@ -203 +201 @@
     }
 
-    if ( fabs( gamma - fGamma ) < 0.05*gamma ) lambda = fLambda;
+    if ( std::fabs( gamma - fGamma ) < 0.05*gamma ) lambda = fLambda;
     else
     {
@@ -495 +493 @@
     result = (k - cof1)*(k - cof1)*(k + cof2)*(k + cof2);
 
-    tmp = sin(tmp)*sin(tmp)*abs(k-cofMin)/result;
+    tmp = std::sin(tmp)*std::sin(tmp)*std::abs(k-cofMin)/result;
 
     if( k == kMin && kMin == G4int(cofMin) )
     {
-      angleSum   += 0.5*tmp; // 0.5*sin(tmp)*sin(tmp)*abs(k-cofMin)/result;
+      angleSum   += 0.5*tmp; // 0.5*std::sin(tmp)*std::sin(tmp)*std::abs(k-cofMin)/result;
     }
     else
     {
-      angleSum   += tmp; // sin(tmp)*sin(tmp)*abs(k-cofMin)/result;
-    }
-    theta = abs(k-cofMin)*cofPHC/energy/(fPlateThick + fGasThick);
+      angleSum   += tmp; // std::sin(tmp)*std::sin(tmp)*std::abs(k-cofMin)/result;
+    }
+    theta = std::abs(k-cofMin)*cofPHC/energy/(fPlateThick + fGasThick);
     if(verboseLevel > 2)
     {
       G4cout<<"iTheta = "<<iTheta<<"; k = "<<k<<"; theta = "
             <<std::sqrt(theta)*fGamma<<"; tmp = "
-            <<tmp // sin(tmp)*sin(tmp)*abs(k-cofMin)/result
+            <<tmp // std::sin(tmp)*std::sin(tmp)*std::abs(k-cofMin)/result
             <<";    angleSum = "<<angleSum<<G4endl;
     }
@@ -697 +695 @@
       if (fAngleRadDistr)
       {
-        // theta = fabs(G4RandGauss::shoot(0.0,pi/gamma));
+        // theta = std::fabs(G4RandGauss::shoot(0.0,pi/gamma));
         theta2 = GetRandomAngle(energyTR,iTkin);
         if(theta2 > 0.) theta = std::sqrt(theta2);
         else            theta = theta2;
       }
-      else theta = fabs(G4RandGauss::shoot(0.0,pi/gamma));
+      else theta = std::fabs(G4RandGauss::shoot(0.0,pi/gamma));
 
       if( theta >= 0.1 ) theta = 0.1;
@@ -710 +708 @@
       phi = twopi*G4UniformRand();
 
-      dirX = sin(theta)*cos(phi);
-      dirY = sin(theta)*sin(phi);
-      dirZ = cos(theta);
+      dirX = std::sin(theta)*std::cos(phi);
+      dirY = std::sin(theta)*std::sin(phi);
+      dirZ = std::cos(theta);
 
       G4ThreeVector directionTR(dirX,dirY,dirZ);
@@ -762 +760 @@
 // The high energy small theta approximation is applied.
 // (matter1 -> matter2, or 2->1)
-// varAngle =2* (1 - cos(theta)) or approximately = theta*theta
+// varAngle =2* (1 - std::cos(theta)) or approximately = theta*theta
 //
 
@@ -850 +848 @@
   // G4cout<<"cof1 = "<<cof1<<"; cof2 = "<<cof2<<"; cofPHC = "<<cofPHC<<G4endl; 
 
-  cofMin  =  sqrt(cof1*cof2); 
+  cofMin  =  std::sqrt(cof1*cof2); 
   cofMin /= cofPHC;
 
@@ -863 +861 @@
   {
     tmp1 = cofPHC*k;
-    tmp2 = sqrt(tmp1*tmp1-cof1*cof2);
+    tmp2 = std::sqrt(tmp1*tmp1-cof1*cof2);
     energy1 = (tmp1+tmp2)/cof1;
     energy2 = (tmp1-tmp2)/cof1;
@@ -874 +872 @@
         tmp1 = ( energy1*energy1*(1./fGamma/fGamma + varAngle) + fSigma1 )
           * fPlateThick/(4*hbarc*energy1);
-        tmp2 = sin(tmp1);
+        tmp2 = std::sin(tmp1);
         tmp  = energy1*tmp2*tmp2;
         tmp2 = fPlateThick/(4*tmp1);
@@ -880 +878 @@
         tmp *= (tmp1-tmp2)*(tmp1-tmp2);
         tmp1 = cof1/(4*hbarc) - cof2/(4*hbarc*energy1*energy1);
-        tmp2 = abs(tmp1);
+        tmp2 = std::abs(tmp1);
         if(tmp2 > 0.) tmp /= tmp2;
         else continue;
@@ -889 +887 @@
         tmp1 = ( energy2*energy2*(1./fGamma/fGamma + varAngle) + fSigma1 )
           * fPlateThick/(4*hbarc*energy2);
-        tmp2 = sin(tmp1);
+        tmp2 = std::sin(tmp1);
         tmp  = energy2*tmp2*tmp2;
         tmp2 = fPlateThick/(4*tmp1);
@@ -895 +893 @@
         tmp *= (tmp1-tmp2)*(tmp1-tmp2);
         tmp1 = cof1/(4*hbarc) - cof2/(4*hbarc*energy2*energy2);
-        tmp2 = abs(tmp1);
+        tmp2 = std::abs(tmp1);
         if(tmp2 > 0.) tmp /= tmp2;
         else continue;
@@ -940 +938 @@
                                              G4double varAngle    ) 
 {
-  G4double cof, length,delta, real, image ;
+  G4double cof, length,delta, real_v, image_v ;
 
   length = 0.5*GetPlateFormationZone(omega,gamma,varAngle) ;
@@ -946 +944 @@
   cof    = 1.0/(1.0 + delta*delta) ;
 
-  real   = length*cof ;
-  image  = real*delta ;
-
-  G4complex zone(real,image); 
+  real_v  = length*cof ;
+  image_v = real_v*delta ;
+
+  G4complex zone(real_v,image_v); 
   return zone ;
 }
@@ -1013 +1011 @@
                                            G4double varAngle    ) 
 {
-  G4double cof, length,delta, real, image ;
+  G4double cof, length,delta, real_v, image_v ;
 
   length = 0.5*GetGasFormationZone(omega,gamma,varAngle) ;
@@ -1019 +1017 @@
   cof    = 1.0/(1.0 + delta*delta) ;
 
-  real   = length*cof ;
-  image  = real*delta ;
-
-  G4complex zone(real,image); 
+  real_v   = length*cof ;
+  image_v  = real_v*delta ;
+
+  G4complex zone(real_v,image_v); 
   return zone ;
 }
@@ -1080 +1078 @@
 void G4VXTRenergyLoss::GetPlateZmuProduct() 
 {
-  ofstream outPlate("plateZmu.dat", ios::out ) ;
-  outPlate.setf( ios::scientific, ios::floatfield );
+  std::ofstream outPlate("plateZmu.dat", std::ios::out ) ;
+  outPlate.setf( std::ios::scientific, std::ios::floatfield );
 
   G4int i ;
@@ -1118 +1116 @@
 void G4VXTRenergyLoss::GetGasZmuProduct() 
 {
-  ofstream outGas("gasZmu.dat", ios::out ) ;
-  outGas.setf( ios::scientific, ios::floatfield );
+  std::ofstream outGas("gasZmu.dat", std::ios::out ) ;
+  outGas.setf( std::ios::scientific, std::ios::floatfield );
   G4int i ;
   G4double omega, varAngle, gamma ;
@@ -1209 +1207 @@
   if (Z < 1.5) T0 = 40.0*keV;
 
-  G4double X   = max(GammaEnergy, T0) / electron_mass_c2;
+  G4double X   = std::max(GammaEnergy, T0) / electron_mass_c2;
   CrossSection = p1Z*std::log(1.+2.*X)/X
                + (p2Z + p3Z*X + p4Z*X*X)/(1. + a*X + b*X*X + c*X*X*X);
@@ -1219 +1217 @@
     G4double dT0 = 1.*keV;
     X = (T0+dT0) / electron_mass_c2 ;
-    G4double sigma = p1Z*log(1.+2*X)/X
+    G4double sigma = p1Z*std::log(1.+2*X)/X
                     + (p2Z + p3Z*X + p4Z*X*X)/(1. + a*X + b*X*X + c*X*X*X);
     G4double   c1 = -T0*(sigma-CrossSection)/(CrossSection*dT0);
     G4double   c2 = 0.150;
-    if (Z > 1.5) c2 = 0.375-0.0556*log(Z);
-    G4double    y = log(GammaEnergy/T0);
-    CrossSection *= exp(-y*(c1+c2*y));
+    if (Z > 1.5) c2 = 0.375-0.0556*std::log(Z);
+    G4double    y = std::log(GammaEnergy/T0);
+    CrossSection *= std::exp(-y*(c1+c2*y));
   }
   //  G4cout << "e= " << GammaEnergy << " Z= " << Z << " cross= " << CrossSection << G4endl;
@@ -1239 +1237 @@
 // The high energy small theta approximation is applied.
 // (matter1 -> matter2, or 2->1)
-// varAngle =2* (1 - cos(theta)) or approximately = theta*theta
+// varAngle =2* (1 - std::cos(theta)) or approximately = theta*theta
 //
 
@@ -1326 +1324 @@
   G4double gamma, numberE ;
 
-  ofstream outEn("numberE.dat", ios::out ) ;
-  outEn.setf( ios::scientific, ios::floatfield );
-
-  ofstream outAng("numberAng.dat", ios::out ) ;
-  outAng.setf( ios::scientific, ios::floatfield );
+  std::ofstream outEn("numberE.dat", std::ios::out ) ;
+  outEn.setf( std::ios::scientific, std::ios::floatfield );
+
+  std::ofstream outAng("numberAng.dat", std::ios::out ) ;
+  outAng.setf( std::ios::scientific, std::ios::floatfield );
 
   for(iTkin=0;iTkin<fTotBin;iTkin++)      // Lorentz factor loop