lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 7.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 11:11:55 +02:00
parent e083ffb441
commit 516dbf1a58
5914 changed files with 202605 additions and 71141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/particles/management/include/G4DynamicParticle.icc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4DynamicParticle.icc,v 1.11 2004/06/11 14:25:26 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-02 $
// $Id: G4DynamicParticle.icc,v 1.12 2004/12/02 07:46:00 kurasige Exp $
// GEANT4 tag $Name: geant4-07-00-cand-03 $
//
//
// ------------------------------------------------------------
@@ -133,7 +133,7 @@ inline const G4ThreeVector& G4DynamicParticle::GetMomentumDirection() const
inline G4ThreeVector G4DynamicParticle::GetMomentum() const
{
G4double pModule = sqrt(theKineticEnergy*theKineticEnergy +
G4double pModule = std::sqrt(theKineticEnergy*theKineticEnergy +
2*theKineticEnergy*theDynamicalMass);
G4ThreeVector pMomentum(theMomentumDirection.x()*pModule,
theMomentumDirection.y()*pModule,
@@ -145,7 +145,7 @@ inline G4LorentzVector G4DynamicParticle::Get4Momentum() const
{
G4double mass = theDynamicalMass;
G4double energy = theKineticEnergy;
G4double momentum = sqrt(energy*energy+2.0*mass*energy);
G4double momentum = std::sqrt(energy*energy+2.0*mass*energy);
G4LorentzVector p4( theMomentumDirection.x()*momentum,
theMomentumDirection.y()*momentum,
theMomentumDirection.z()*momentum,
@@ -156,7 +156,7 @@ inline G4LorentzVector G4DynamicParticle::Get4Momentum() const
inline G4double G4DynamicParticle::GetTotalMomentum() const
{
// The momentum is returned in energy equivalent.
return sqrt((theKineticEnergy + 2.*theDynamicalMass)* theKineticEnergy);
return std::sqrt((theKineticEnergy + 2.*theDynamicalMass)* theKineticEnergy);
}
inline G4ParticleDefinition* G4DynamicParticle::GetDefinition() const