Import Geant4 10.7.0.beta source tree

source/processes/hadronic/models/cascade/History

@@ -14,20 +14,29 @@ code and to keep track of all tags.
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
 
-06 February 2019  Vladimir Ivanchenko (hadr-casc-V10-05-03)
------------------------------------------------------------
-13 January 2020  Dennis Wright 
+ 5 May 2020  Gunter Folger      (hadr-casc-V10-06-04)
+ - Fix for clang10: confusing indentation caused by if
+    add {} around statements
+    
+-----------------------------------------------------
+26 February 2020  Dennis Wright (hadr-casc-V10-06-03)
+-----------------------------------------------------
+- G4LightTargetCollider::collide() : avoid frequent energy conservation warning
+  from G4HadronicProcess by setting up "no interaction" final state below 
+  threshold 
+
+13 January 2020  Dennis Wright (hadr-casc-V10-06-02)
 ----------------------------------------------------
 - G4CascadeInterface.cc: fix memory leak by deleting ltcollider in class
   dtor
 
-10 January 2020  Michael Kelsey 
+10 January 2020  Michael Kelsey (hadr-casc-V10-06-01)
 -----------------------------------------------------
 - G4CascadeParamMessenger.cc: Ensure that Bertini-specific commands get
   added to /process/had/cascade/ directory, instead of /process/had.
   Requires resetting cmdDir=0 between CreateDirectory() calls.
 
-16 December 2019  Vladimir Ivanchenko 
+16 December 2019  Vladimir Ivanchenko (hadr-casc-V10-06-00)
 -----------------------------------------------------------
 - G4CascadeCheckBalance: fixed outstanding problem of the interface 
   with native pre-compound model, which happens since in the 

source/processes/hadronic/models/cascade/cascade/src/G4CollisionOutput.cc

@@ -539,9 +539,9 @@ void G4CollisionOutput::setOnShell(G4InuclParticle* bullet,
   }
 
   // Momentum (hard) tuning required for energy conservation
-  if (verboseLevel > 2)
+  if (verboseLevel > 2) {
     G4cout << " trying hard (particle-pair) tuning" << G4endl;
-
+  }
   /*****
   // Hard tuning of quasielastic particle against nucleus
   if (npart == 1) {

source/processes/hadronic/models/cascade/cascade/src/G4LightTargetCollider.cc

@@ -85,18 +85,20 @@ void G4LightTargetCollider::collide(G4InuclParticle* bullet,
     G4cout << "     Target: " << target->getDefinition()->GetParticleName() << G4endl;
   }
 
-  // Particle-on-particle collision
-  // No nucleus involved, just a proton in this case
-  if (useEPCollider(bullet,target)) {
-    if (verboseLevel > 2)
-      G4cout << " InuclCollider -> particle on particle collision" << G4endl;
- 
-    theElementaryParticleCollider->collide(bullet, target, globalOutput);
-    return;
-  }
-
   G4double ke = bullet->getKineticEnergy();
-  if (target->getDefinition() == G4Deuteron::Deuteron()) {
+
+  if (target->getDefinition() == G4Proton::Proton() ) {
+    if (ke < 0.1447) {
+      // Below threshold lab energy for pi0 creation 
+      globalOutput.trivialise(bullet, target);
+    } else {
+      // Need inelastic cross section in this class if we want to replace ElementaryParticleCollider 
+      // with SingleNucleonScattering
+      theElementaryParticleCollider->collide(bullet, target, globalOutput);
+      if (globalOutput.numberOfOutgoingParticles() == 0) globalOutput.trivialise(bullet, target);
+    }
+
+  } else if (target->getDefinition() == G4Deuteron::Deuteron() ) {
 
     if (ke < mP + mN - mD) {
       // Should not happen as long as inelastic cross section is zero