Import Geant4 10.6.0 source tree

source/physics_lists/constructors/ions/History

@@ -13,6 +13,14 @@ introduced in the code and keeptrack of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+16-August-2019, Vladimir Ivanchenko (phys-ctor-ions-V10-05-01)
+- G4IonQMDPhysics : replacing explicit values for the QMD model
+  energy transition with value from G4HadronicParameters.
+
+06-August-2019, Alberto Ribon  (phys-ctor-ions-V10-05-00)
+- G4IonPhysics, G4IonPhysicsPHP : replacing explicit values for the
+  energy transition region with values from G4HadronicParameters.
+
 04-September-2018, Vladimir Ivanchenko  (phys-ctor-ions-V10-04-04)
 03-September-2018, Vladimir Ivanchenko  (phys-ctor-ions-V10-04-03)
 - Major revision of all ion builders: reduced number of TLS variables;

source/physics_lists/constructors/ions/README

@@ -7,8 +7,8 @@
  generic ion projectiles), with Glauber-Gribov cross section and
  Binary Light Ion (BIC, with Precompound/de-excitation) and Fritiof (FTF)
  string model (with Precompound/de-excitation) for the final state.
- BIC is used for projectiles of kinetic energies below 4 GeV/nucleon, and
- FTF above 2 GeV/nucleon.
+ BIC is used for projectiles of kinetic energies below 6 GeV/nucleon, and
+ FTF above 3 GeV/nucleon.
  
  G4IonINCLXXPhysics
  ------------------

source/physics_lists/constructors/ions/include/G4IonPhysicsPHP.hh

@@ -31,8 +31,7 @@
 // Author:    A.Ribon  24-May-2016
 //
 // Ion physics with ParticleHP, used below 200 MeV/n for d, t, He3, alpha;
-// Binary Cascade used below 4 GeV/n (down to 190 MeV/n for d, t, He3, alpha,
-// and 0 for the other ions); FTFP used above 2 GeV/n.
+// Binary Cascade used above to 190 MeV/n and then FTFP at higher energies.
 // This is as G4IonPhysics, except that ParticleHP is used below 200 MeV/n
 // for d, t, He3, alpha. 
 // 

source/physics_lists/constructors/ions/src/G4IonPhysics.cc

@@ -120,16 +120,16 @@ void G4IonPhysics::ConstructProcess()
   // Binary Cascade
   G4HadronicInteraction* theIonBC = 
     new G4BinaryLightIonReaction(thePreCompound);
-  theIonBC->SetMinEnergy(0.0);
-  theIonBC->SetMaxEnergy(4*GeV);
+  theIonBC->SetMinEnergy( 0.0 );
+  theIonBC->SetMaxEnergy( G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade() );
 
   // FTFP
   G4HadronicInteraction* theFTFP = nullptr;
   if(emax > theIonBC->GetMaxEnergy()) {
     theBuilder = new G4FTFBuilder("FTFP",thePreCompound);
     theFTFP = theBuilder->GetModel();
-    theFTFP->SetMinEnergy(2*GeV);
-    theFTFP->SetMaxEnergy(emax);
+    theFTFP->SetMinEnergy( G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade() );
+    theFTFP->SetMaxEnergy( emax );
   }
 
   G4CrossSectionInelastic* theNuclNuclData = 

source/physics_lists/constructors/ions/src/G4IonPhysicsPHP.cc

@@ -108,8 +108,8 @@ void G4IonPhysicsPHP::ConstructProcess() {
 
   const G4double maxPHP = 200.0*MeV;
   const G4double overlapPHP_BIC = 10.0*MeV;
-  const G4double maxBIC = 4.0*GeV;
-  const G4double minFTF = 2.0* GeV;
+  const G4double maxBIC = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
+  const G4double minFTF = G4HadronicParameters::Instance()->GetMinEnergyTransitionFTF_Cascade();
   const G4double maxFTF = G4HadronicParameters::Instance()->GetMaxEnergy();
 
   G4HadronicInteraction* p =

source/physics_lists/constructors/ions/src/G4IonQMDPhysics.cc

@@ -72,6 +72,8 @@
 #include "G4DeexPrecoParameters.hh"
 #include "G4NuclearLevelData.hh"
 
+#include "G4HadronicParameters.hh"
+
 // factory
 #include "G4PhysicsConstructorFactory.hh"
 //
@@ -111,6 +113,7 @@ void G4IonQMDPhysics::ConstructProcess()
   theIonBC->SetMaxEnergy(eminQMD + overlap);
 
   G4double emax = G4HadronicParameters::Instance()->GetMaxEnergy();
+  emaxQMD = G4HadronicParameters::Instance()->GetMaxEnergyTransitionFTF_Cascade();
   G4HadronicInteraction* theFTFP = nullptr;
   if(emax > emaxQMD) {
     theFTFPBuilder = new G4FTFBuilder("FTFP",thePreCompound);