Import Geant4 9.6.0 source tree

source/processes/electromagnetic/muons/include/G4EnergyLossForExtrapolator.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4EnergyLossForExtrapolator.hh,v 1.12 2008-11-13 14:14:07 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 //---------------------------------------------------------------------------
 //
@@ -51,10 +50,11 @@
 #ifndef G4EnergyLossForExtrapolator_h
 #define G4EnergyLossForExtrapolator_h 1
 
+#include <vector>
+#include <CLHEP/Units/PhysicalConstants.h>
 
 #include "globals.hh"
 #include "G4PhysicsTable.hh"
-#include <vector>
 
 class G4ParticleDefinition;
 class G4Material;
@@ -243,7 +243,7 @@ G4EnergyLossForExtrapolator::AverageScatteringAngle(G4double kinEnergy,
   if(SetupKinematics(part, mat, kinEnergy)) {
     G4double t = stepLength/radLength;
     G4double y = std::max(0.001, t); 
-    theta = 19.23*MeV*std::sqrt(charge2*t)*(1.0 + 0.038*std::log(y))/(beta2*gam*mass);
+    theta = 19.23*CLHEP::MeV*std::sqrt(charge2*t)*(1.0 + 0.038*std::log(y))/(beta2*gam*mass);
   }
   return theta;
 }
@@ -271,7 +271,7 @@ G4double G4EnergyLossForExtrapolator::EnergyDispersion(G4double kinEnergy,
   G4double sig2 = 0.0;
   if(SetupKinematics(part, mat, kinEnergy)) {
     G4double step = ComputeTrueStep(mat,part,kinEnergy,stepLength);
-    sig2 = (1.0/beta2 - 0.5)*twopi_mc2_rcl2*tmax*step*electronDensity*charge2;
+    sig2 = (1.0/beta2 - 0.5)*CLHEP::twopi_mc2_rcl2*tmax*step*electronDensity*charge2;
   }
   return sig2;
 }

source/processes/electromagnetic/muons/include/G4MuBetheBlochModel.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuBetheBlochModel.hh,v 1.18 2009-02-20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -------------------------------------------------------------------
 //
@@ -60,6 +59,8 @@
 #ifndef G4MuBetheBlochModel_h
 #define G4MuBetheBlochModel_h 1
 
+#include <CLHEP/Units/PhysicalConstants.h>
+
 #include "G4VEmModel.hh"
 
 class G4ParticleChangeForLoss;
@@ -148,7 +149,7 @@ inline void G4MuBetheBlochModel::SetParticle(const G4ParticleDefinition* p)
     particle = p;
     mass = particle->GetPDGMass();
     massSquare = mass*mass;
-    ratio = electron_mass_c2/mass;
+    ratio = CLHEP::electron_mass_c2/mass;
   }
 }
 

source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuBremsstrahlung.hh,v 1.31 2009-02-20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -------------------------------------------------------------------
 //

source/processes/electromagnetic/muons/include/G4MuBremsstrahlungModel.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuBremsstrahlungModel.hh,v 1.23 2010-10-26 13:52:32 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -------------------------------------------------------------------
 //
@@ -61,6 +60,8 @@
 #ifndef G4MuBremsstrahlungModel_h
 #define G4MuBremsstrahlungModel_h 1
 
+#include <CLHEP/Units/PhysicalConstants.h>
+
 #include "G4VEmModel.hh"
 #include "G4NistManager.hh"
 
@@ -149,6 +150,8 @@ private:
   G4double lowestKinEnergy;
   G4double minThreshold;
 
+  G4double fDN[93];
+
   std::vector<G4DataVector*> partialSumSigma;
 };
 
@@ -167,9 +170,9 @@ void G4MuBremsstrahlungModel::SetParticle(const G4ParticleDefinition* p)
   if(!particle) {
     particle = p;
     mass = particle->GetPDGMass();
-    rmass=mass/electron_mass_c2 ;
-    cc=classic_electr_radius/rmass ;
-    coeff= 16.*fine_structure_const*cc*cc/3. ;
+    rmass=mass/CLHEP::electron_mass_c2 ;
+    cc=CLHEP::classic_electr_radius/rmass ;
+    coeff= 16.*CLHEP::fine_structure_const*cc*cc/3. ;
   }
 }
 

source/processes/electromagnetic/muons/include/G4MuIonisation.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuIonisation.hh,v 1.31 2009-02-20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -------------------------------------------------------------------
 //

source/processes/electromagnetic/muons/include/G4MuMultipleScattering.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuMultipleScattering.hh,v 1.4 2009-10-30 18:37:06 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -----------------------------------------------------------------------------
 //

source/processes/electromagnetic/muons/include/G4MuPairProduction.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuPairProduction.hh,v 1.31 2009-02-20 14:48:16 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -------------------------------------------------------------------
 //

source/processes/electromagnetic/muons/include/G4MuPairProductionModel.hh

@@ -23,8 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4MuPairProductionModel.hh,v 1.29 2010-10-26 13:52:32 vnivanch Exp $
-// GEANT4 tag $Name: not supported by cvs2svn $
+// $Id$
 //
 // -------------------------------------------------------------------
 //