Changeset 1315 for trunk/source/processes/hadronic/models/cascade/cascade/src/G4RegionModel.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/hadronic/models/cascade/cascade/src/G4RegionModel.cc (modified) (3 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/src/G4RegionModel.cc

@@ -23 +23 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+// $Id: G4RegionModel.cc,v 1.16 2010/03/19 05:03:23 mkelsey Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
 //
+// 20100319  M. Kelsey -- Eliminate unnecessary use of std::pow()
+
 #include "G4RegionModel.hh"
 #include "G4HadronicException.hh"
+#include "G4InuclSpecialFunctions.hh"
+
+using namespace G4InuclSpecialFunctions;
 
 const G4double G4RegionModel::radius0 = 1.0E-15; 
@@ -33 +40 @@
 {
   //count the radiuses, densities and fermi momenta with A and Z
-  G4double oneThird = 1.0/3.0;
-  G4double r = radius0*std::pow(G4double(A), G4double(oneThird));
+  G4double r = radius0*G4cbrt(A);
 
   if(numberOfLayers==1){ 
     radius.push_back(r);
 
-    G4double rho = G4double(A) / (4.0/3.0*pi*std::pow(r,G4double(3)));
+    G4double vol = 4.0/3.0 * pi * r*r*r;
+    G4double rho = G4double(A) / vol;
     density.push_back(rho);
 
     G4double protonMass = G4Proton::Proton()->GetPDGMass();
     G4double neutronMass = G4Neutron::Neutron()->GetPDGMass();
-    G4double protonDensity = G4double(Z) / (4.0/3.0*pi*std::pow(r,G4double(3)));
-    G4double neutronDensity = G4double(A-Z) / (4.0/3.0*pi*std::pow(r,G4double(3)));
+    G4double protonDensity = G4double(Z) / vol;
+    G4double neutronDensity = G4double(A-Z) / vol;
 
     protonFermiEnergy.push_back(GetFermiEnergy(protonDensity, protonMass));
@@ -123 +130 @@
 G4double G4RegionModel::GetFermiMomentum(G4double aDensity,
                                          G4double aMass){
-  
   return std::sqrt(2*aMass*GetFermiEnergy(aDensity, aMass));
-
 }
 
 G4double G4RegionModel::GetFermiEnergy(G4double aDensity,
                                          G4double aMass){
-  
-G4double twoThirds = 2.0/3.0;
-    return (std::pow(hbar_Planck,2)/(2.0*aMass)*std::pow((3.0*pi2*aDensity),twoThirds)); 
+  G4double densFactor = G4cbrt(3.0*pi2*aDensity);               // 2/3 power
+  densFactor *= densFactor;
+
+  return hbar_Planck*hbar_Planck/(2.0*aMass) * densFactor;
 }