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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ForwardXrayTR.cc,v 1.14 2007/05/11 14:23:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ForwardXrayTR.cc,v 1.15 2010/06/16 15:34:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // G4ForwardXrayTR class -- implementation file
@@ -84 +84 @@
 
 G4double G4ForwardXrayTR::fCofTR     = fine_structure_const/pi ;
-
-using namespace std;
 
 /*   ************************************************************************
@@ -411 +409 @@
 // The high energy small theta approximation is applied.
 // (matter1 -> matter2)
-// varAngle =2* (1 - cos(Theta)) or approximately = Theta*Theta
+// varAngle =2* (1 - std::cos(Theta)) or approximately = Theta*Theta
 //
 
@@ -452 +450 @@
   a4 = a2*a2 ;
   b4 = b2*b2 ;
-  a = sqrt(a2) ;
-  b = sqrt(b2) ;
-  cof1 = c*c*(0.5/(a2*(x2 +a2)) +0.5*log(x2/(x2 +a2))/a4) ;
-  cof3 = d*d*(0.5/(b2*(x2 +b2)) +0.5*log(x2/(x2 +b2))/b4) ;
-  cof2 = -c*d*(log(x2/(x2 +b2))/b2 - log(x2/(x2 +a2))/a2)/(a2 - b2)   ;
+  a = std::sqrt(a2) ;
+  b = std::sqrt(b2) ;
+  cof1 = c*c*(0.5/(a2*(x2 +a2)) +0.5*std::log(x2/(x2 +a2))/a4) ;
+  cof3 = d*d*(0.5/(b2*(x2 +b2)) +0.5*std::log(x2/(x2 +b2))/b4) ;
+  cof2 = -c*d*(std::log(x2/(x2 +b2))/b2 - std::log(x2/(x2 +a2))/a2)/(a2 - b2)   ;
   return -varAngle*(cof1 + cof2 + cof3) ;
 }
@@ -503 +501 @@
 //
 // Analytical Expression for   spectral density of Xray TR photons
-// x = 2*(1 - cos(Theta)) ~ Theta^2
+// x = 2*(1 - std::cos(Theta)) ~ Theta^2
 //
 
@@ -514 +512 @@
   b =  1.0/(fGamma*fGamma)
      + fSigma2/(energy*energy)  ;
-  return ( (a + b)*log((x + b)/(x + a))/(a - b)
+  return ( (a + b)*std::log((x + b)/(x + a))/(a - b)
           + a/(x + a) + b/(x + b) )/energy ;
 
@@ -688 +686 @@
           if(anglePos > (*(*fAngleDistrTable)(iPlace))(iTransfer)) break ;
         }
-        theta = sqrt((*fAngleDistrTable)(iPlace)->GetLowEdgeEnergy(iTransfer-1)) ;
+        theta = std::sqrt((*fAngleDistrTable)(iPlace)->GetLowEdgeEnergy(iTransfer-1)) ;
 
         // G4cout<<iTransfer<<" :  theta = "<<theta<<G4endl ;
 
         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) ;
         directionTR.rotateUz(particleDir) ;
@@ -763 +761 @@
                       (*(*fAngleDistrTable)(iPlace + 1))(iTransfer)*W2)) break ;
           }
-          theta = sqrt(((*fAngleDistrTable)(iPlace)->
+          theta = std::sqrt(((*fAngleDistrTable)(iPlace)->
                         GetLowEdgeEnergy(iTransfer-1))*W1+
                   ((*fAngleDistrTable)(iPlace + 1)->
@@ -771 +769 @@
 
           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) ;
           directionTR.rotateUz(particleDir) ;