Import Geant4 8.3.0 source tree
This commit is contained in:
@@ -14,6 +14,12 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
04 May 2007 Aatos Heikkinen (hadr-casc-V08-02-00)
|
||||
-------------------------------------------------
|
||||
|
||||
- Added protection in G4ElementaryParticleCollider against negative
|
||||
value to sqrt().
|
||||
|
||||
08 May 2006 Dennis Wright (hadr-casc-V08-00-00)
|
||||
-----------------------------------------------
|
||||
|
||||
|
||||
+8
-2
@@ -562,8 +562,14 @@ generateSCMfinalState(G4double ekin,
|
||||
G4double m2 = dummy.getParticleMass(particle_kinds[1]);
|
||||
m2 *= m2;
|
||||
G4double a = 0.5 * (etot_scm * etot_scm - m1 - m2);
|
||||
G4double np = std::sqrt((a * a - m1 * m2) / (m1 + m2 + 2.0 * a));
|
||||
mom = particleSCMmomentumFor2to2(is, kw, ekin, np);
|
||||
G4double em = a * a - m1 * m2;
|
||||
|
||||
if (em > 0) { // see if it is possible to rescale?
|
||||
G4double np = std::sqrt( em / (m1 + m2 + 2.0 * a));
|
||||
mom = particleSCMmomentumFor2to2(is, kw, ekin, np);
|
||||
} else { // rescaling not possible
|
||||
mom = particleSCMmomentumFor2to2(is, kw, ekin, pscm);
|
||||
}
|
||||
|
||||
} else {
|
||||
mom = particleSCMmomentumFor2to2(is, kw, ekin, pscm);
|
||||
|
||||
Reference in New Issue
Block a user