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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
+12 -12
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4GHEKinematicsVector.hh,v 1.1.10.1 1999/12/07 20:52:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4GHEKinematicsVector.hh,v 1.1.10.1.2.2 1999/12/10 15:42:17 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// ------------------------------------------------------------
// GEANT 4 class header file --- Copyright CERN 1998
@@ -95,7 +95,7 @@ class G4GHEKinematicsVector
{
momentum = mom;
energy = sqrt(mass*mass + momentum.mag2());
kineticEnergy = max(0.,energy - mass);
kineticEnergy = G4std::max(0.,energy - mass);
return;
}
@@ -118,7 +118,7 @@ class G4GHEKinematicsVector
momentum.setY( y );
momentum.setZ( z );
energy = sqrt(mass*mass + momentum.mag2());
kineticEnergy = max(0.,energy-mass);
kineticEnergy = G4std::max(0.,energy-mass);
return;
}
@@ -136,7 +136,7 @@ class G4GHEKinematicsVector
momentum.setX( x );
momentum.setY( y );
energy = sqrt(mass*mass + momentum.mag2());
kineticEnergy = max(0.,energy-mass);
kineticEnergy = G4std::max(0.,energy-mass);
return;
}
@@ -152,7 +152,7 @@ class G4GHEKinematicsVector
{
momentum.setZ( z );
energy = sqrt(mass*mass + momentum.mag2());
kineticEnergy = max(0.,energy-mass);
kineticEnergy = G4std::max(0.,energy-mass);
return;
}
@@ -248,10 +248,10 @@ class G4GHEKinematicsVector
inline
void SetMassAndUpdate( G4double m )
{
kineticEnergy = max(0., energy - m);
kineticEnergy = G4std::max(0., energy - m);
mass = m;
energy = kineticEnergy + mass;
G4double momnew = sqrt(max(0., energy*energy - mass*mass));
G4double momnew = sqrt(G4std::max(0., energy*energy - mass*mass));
if ( momnew == 0.0)
{
momentum.setX( 0.0 );
@@ -347,7 +347,7 @@ class G4GHEKinematicsVector
mass = -1. * sqrt( -b );
else
mass = sqrt( b );
kineticEnergy = max(0.,energy - mass);
kineticEnergy = G4std::max(0.,energy - mass);
charge = p1.charge + p2.charge;
code = p1.code + p2.code;
particleDef = p1.particleDef;
@@ -363,7 +363,7 @@ class G4GHEKinematicsVector
mass = -1. * sqrt( -b );
else
mass = sqrt( b );
kineticEnergy = max(0.,energy - mass);
kineticEnergy = G4std::max(0.,energy - mass);
charge = p1.charge - p2.charge;
code = p1.code - p2.code;
particleDef = p1.particleDef;
@@ -379,7 +379,7 @@ class G4GHEKinematicsVector
momentum.setZ( p1.momentum.z()+a*p2.momentum.z() );
energy = sqrt( sqr(p1.mass) + momentum.mag2() );
mass = p1.mass;
kineticEnergy = max(0.,energy - mass);
kineticEnergy = G4std::max(0.,energy - mass);
timeOfFlight = p1.timeOfFlight;
side = p1.side;
flag = p1.flag;
@@ -656,7 +656,7 @@ class G4GHEKinematicsVector
G4cout << "G4GHEKinematicsVector: "
<< L << " " << momentum.x() << " " << momentum.y() << " " << momentum.z() << " "
<< energy << " " << kineticEnergy << " " << mass << " " << charge << " "
<< timeOfFlight << " " << side << " " << flag << " " << code << particleDef << endl;
<< timeOfFlight << " " << side << " " << flag << " " << code << particleDef << G4endl;
return;
}