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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Scintillation.cc,v 1.31 2010/05/27 20:49:40 gum Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// $Id: G4Scintillation.cc,v 1.32 2010/06/16 15:34:15 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -71 +71 @@
 #include "G4Scintillation.hh"
 
-using namespace std;
-
 /////////////////////////
 // Class Implementation  
@@ -214 +212 @@
         if (MeanNumberOfPhotons > 10.)
         {
-          G4double sigma = ResolutionScale * sqrt(MeanNumberOfPhotons);
+          G4double sigma = ResolutionScale * std::sqrt(MeanNumberOfPhotons);
           NumPhotons = G4int(G4RandGauss::shoot(MeanNumberOfPhotons,sigma)+0.5);
         }
@@ -281 +279 @@
                                           GetConstProperty("YIELDRATIO");
                  if ( ExcitationRatio == 1.0 ) {
-                    Num = G4int (min(YieldRatio,1.0) * NumPhotons);
+                    Num = G4int (std::min(YieldRatio,1.0) * NumPhotons);
                  }
                  else {
-                    Num = G4int (min(ExcitationRatio,1.0) * NumPhotons);
+                    Num = G4int (std::min(ExcitationRatio,1.0) * NumPhotons);
                  }
                  ScintillationTime   = aMaterialPropertiesTable->
@@ -330 +328 @@
 
                 G4double cost = 1. - 2.*G4UniformRand();
-                G4double sint = sqrt((1.-cost)*(1.+cost));
+                G4double sint = std::sqrt((1.-cost)*(1.+cost));
 
                 G4double phi = twopi*G4UniformRand();
-                G4double sinp = sin(phi);
-                G4double cosp = cos(phi);
+                G4double sinp = std::sin(phi);
+                G4double cosp = std::cos(phi);
 
                 G4double px = sint*cosp;
@@ -355 +353 @@
 
                 phi = twopi*G4UniformRand();
-                sinp = sin(phi);
-                cosp = cos(phi);
+                sinp = std::sin(phi);
+                cosp = std::cos(phi);
 
                 photonPolarization = cosp * photonPolarization + sinp * perp;
@@ -392 +390 @@
                 if (ScintillationRiseTime==0.0) {
                    deltaTime = deltaTime - 
-                          ScintillationTime * log( G4UniformRand() );
+                          ScintillationTime * std::log( G4UniformRand() );
                 } else {
                    deltaTime = deltaTime +
@@ -633 +631 @@
           // make sure the envelope function is 
           // always larger than the bi-exponential
-          G4double t = -1.0*tau2*log(1-ran1);
+          G4double t = -1.0*tau2*std::log(1-ran1);
           G4double g = d*single_exp(t,tau2);
           if (ran2 <= bi_exp(t,tau1,tau2)/g) return t;