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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4SynchrotronRadiation.cc,v 1.5 2006/06/29 19:56:15 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4SynchrotronRadiation.cc,v 1.6 2010/06/16 15:34:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // --------------------------------------------------------------
@@ -44 +44 @@
 
 #include "G4SynchrotronRadiation.hh"
-// #include "G4Integrator.hh"
 #include "G4UnitsTable.hh"
-
-using namespace std;
 
 ///////////////////////////////////////////////////////////////////////
@@ -65 +62 @@
   fFieldPropagator = transportMgr->GetPropagatorInField();
 
-  fLambdaConst = sqrt(3.0)*electron_mass_c2/
+  fLambdaConst = std::sqrt(3.0)*electron_mass_c2/
                            (2.5*fine_structure_const*eplus*c_light) ;
   fEnergyConst = 1.5*c_light*c_light*eplus*hbar_Planck/electron_mass_c2  ;
@@ -169 +166 @@
                 << "  B = " << Btot/tesla << " Tesla"
             << "  perpB = " << perpB/tesla << " Tesla"
-            << "  Theta = " << Theta << " sin(Theta)=" << sin(Theta) << '\n'
+            << "  Theta = " << Theta << " std::sin(Theta)=" << std::sin(Theta) << '\n'
             << "  ptot  = " << G4BestUnit(ptot,"Energy")
             << "  rho   = " << G4BestUnit(rho,"Length")
@@ -262 +259 @@
       G4double Phi  = twopi * G4UniformRand() ;
 
-      G4double dirx = sin(Teta)*cos(Phi) ,
-               diry = sin(Teta)*sin(Phi) ,
-               dirz = cos(Teta) ;
+      G4double dirx = std::sin(Teta)*std::cos(Phi) ,
+               diry = std::sin(Teta)*std::sin(Phi) ,
+               dirz = std::cos(Teta) ;
 
       G4ThreeVector gammaDirection ( dirx, diry, dirz);
@@ -271 +268 @@
       // polarization of new gamma
 
-      // G4double sx =  cos(Teta)*cos(Phi);
-      // G4double sy =  cos(Teta)*sin(Phi);
-      // G4double sz = -sin(Teta);
+      // G4double sx =  std::cos(Teta)*std::cos(Phi);
+      // G4double sy =  std::cos(Teta)*std::sin(Phi);
+      // G4double sz = -std::sin(Teta);
 
       G4ThreeVector gammaPolarization = FieldValue.cross(gammaDirection);
@@ -368 +365 @@
   else if(x<aa3) return       Chebyshev(aa2,aa3,cheb2,ncheb2,x);
   else if(x<1-0.0000841363)
-  { G4double y=-log(1-x);
+  { G4double y=-std::log(1-x);
         return y*Chebyshev(aa4,aa5,cheb3,ncheb3,y);
   }
   else
-  { G4double y=-log(1-x);
+  { G4double y=-std::log(1-x);
         return y*Chebyshev(aa5,aa6,cheb4,ncheb4,y);
   }
@@ -384 +381 @@
   static G4bool FirstTime=true;
   if(verboseLevel > 0 && FirstTime)
-  { G4double Emean=8./(15.*sqrt(3.))*Ecr; // mean photon energy
-    G4double E_rms=sqrt(211./675.)*Ecr; // rms of photon energy distribution
+  { G4double Emean=8./(15.*std::sqrt(3.))*Ecr; // mean photon energy
+    G4double E_rms=std::sqrt(211./675.)*Ecr; // rms of photon energy distribution
     G4cout << "G4SynchrotronRadiation::GetRandomEnergySR :" << '\n' << std::setprecision(4)
         << "  Ecr   = "    << G4BestUnit(Ecr,"Energy") << '\n'