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

Import Geant4 10.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/hadronic/util/History
+6
View File
@@ -14,6 +14,12 @@ code and to keep track of all tags.
* Please list in reverse chronological order (last date on top)
---------------------------------------------------------------
5 December 2016 Dennis Wright (hadr-util-V10-02-01)
--------------------------------------------------------
- G4Nucleus::GetThermalNucleus: fix mistake in branch on total energy
calculation using relativistic energy at higher energies (see bug
report #1911)
10 February 2016 Alberto Ribon (hadr-util-V10-02-00)
--------------------------------------------------------
- G4Nucleus : increased the max number of loops allowed in the method
source/processes/hadronic/util/src/G4Nucleus.cc
+23 -22
View File
@@ -142,28 +142,29 @@ GetBiasedThermalNucleus(G4double aMass, G4ThreeVector aVelocity, G4double temp)
G4ReactionProduct
G4Nucleus::GetThermalNucleus(G4double targetMass, G4double temp) const
{
G4double currentTemp = temp;
if(currentTemp < 0) currentTemp = theTemp;
G4ReactionProduct theTarget;
theTarget.SetMass(targetMass*G4Neutron::Neutron()->GetPDGMass());
G4double px, py, pz;
px = GetThermalPz(theTarget.GetMass(), currentTemp);
py = GetThermalPz(theTarget.GetMass(), currentTemp);
pz = GetThermalPz(theTarget.GetMass(), currentTemp);
theTarget.SetMomentum(px, py, pz);
G4double tMom = std::sqrt(px*px+py*py+pz*pz);
G4double tEtot = std::sqrt((tMom+theTarget.GetMass())*
(tMom+theTarget.GetMass())-
2.*tMom*theTarget.GetMass());
if(1-tEtot/theTarget.GetMass()>0.001)
{
theTarget.SetTotalEnergy(tEtot);
}
else
{
theTarget.SetKineticEnergy(tMom*tMom/(2.*theTarget.GetMass()));
}
return theTarget;
G4double currentTemp = temp;
if (currentTemp < 0) currentTemp = theTemp;
G4ReactionProduct theTarget;
theTarget.SetMass(targetMass*G4Neutron::Neutron()->GetPDGMass());
G4double px, py, pz;
px = GetThermalPz(theTarget.GetMass(), currentTemp);
py = GetThermalPz(theTarget.GetMass(), currentTemp);
pz = GetThermalPz(theTarget.GetMass(), currentTemp);
theTarget.SetMomentum(px, py, pz);
G4double tMom = std::sqrt(px*px+py*py+pz*pz);
G4double tEtot = std::sqrt((tMom+theTarget.GetMass())*
(tMom+theTarget.GetMass())-
2.*tMom*theTarget.GetMass());
// if(1-tEtot/theTarget.GetMass()>0.001) this line incorrect (Bug report 1911)
if (tEtot/theTarget.GetMass() - 1. > 0.001) {
// use relativistic energy for higher energies
theTarget.SetTotalEnergy(tEtot);
} else {
// use p**2/2M for lower energies (to preserve precision?)
theTarget.SetKineticEnergy(tMom*tMom/(2.*theTarget.GetMass()));
}
return theTarget;
}