Import Geant4 10.7.0 source tree

source/processes/hadronic/util/include/G4HadSignalHandler.hh

@@ -26,8 +26,8 @@
 #ifndef G4HadSignalHandler_hh
 #define G4HadSignalHandler_hh
 
-#ifndef G4HadSignalHandler_off
-
+//#ifndef G4HadSignalHandler_off
+#if 0
 #include <iostream>
 #include <signal.h>
 #include <vector>

source/processes/hadronic/util/include/G4HadronicParameters.hh

@@ -75,17 +75,54 @@ class G4HadronicParameters {
     // transition region between the two strings models - the Quark Gluon String (QGS)
     // model and the Fritiof (FTF) model.
 
+    G4double EnergyThresholdForHeavyHadrons() const;
+    void SetEnergyThresholdForHeavyHadrons( G4double val );
+    // if max kinetic energy is below this limit EM and hadronic physics is not 
+    // instantiated for hyperons, anti-hyperons, anti light ions, b-, c- particles
+
+    G4double XSFactorNucleonInelastic() const;
+    void SetXSFactorNucleonInelastic( G4double val );
+    G4double XSFactorNucleonElastic() const;
+    void SetXSFactorNucleonElastic( G4double val );
+    // cross section factor for protons and neutrons
+
+    G4double XSFactorPionInelastic() const;
+    void SetXSFactorPionInelastic( G4double val );
+    G4double XSFactorPionElastic() const;
+    void SetXSFactorPionElastic( G4double val );
+    // cross section factor for pions
+
+    G4double XSFactorHadronInelastic() const;
+    void SetXSFactorHadronInelastic( G4double val );
+    G4double XSFactorHadronElastic() const;
+    void SetXSFactorHadronElastic( G4double val );
+    // cross section factor for other hadrons and ions
+
+    G4double XSFactorEM() const;
+    void SetXSFactorEM( G4double val );
+    // cross section factor for gamma and leptons
+
     G4bool EnableBCParticles() const;
     void SetEnableBCParticles( G4bool val );
     // Baryons and mesons with c- and b- quarks may be enabled/disabled
     // This flag is used both by EM and hadronic physics constructors
 
+    G4bool ApplyFactorXS() const;
+    void SetApplyFactorXS( G4bool val );
+    // Flag enabling cross section factor definition
+
     G4int GetVerboseLevel() const;
     void SetVerboseLevel( const G4int val );
     // Getter/Setter of the general verbosity level for hadronics.
   
+    G4bool EnableCRCoalescence() const;
+    void SetEnableCRCoalescence( G4bool val );
+    // Boolean switch that allows to apply the Cosmic Ray (CR) coalescence algorithm
+    // to the secondaries produced by a string model. By default it is disabled.
+
   private:
     G4HadronicParameters();
+
     G4bool IsLocked() const;
 
     static G4HadronicParameters* sInstance;
@@ -100,8 +137,20 @@ class G4HadronicParameters {
     G4double fMaxEnergyTransitionFTF_Cascade;
     G4double fMinEnergyTransitionQGS_FTF;
     G4double fMaxEnergyTransitionQGS_FTF;
-    G4int    fVerboseLevel;
-    G4bool   fEnableBC;
+    G4double fEnergyThresholdForHeavyHadrons;
+    G4double fXSFactorNucleonInelastic = 1.0;
+    G4double fXSFactorPionInelastic = 1.0;
+    G4double fXSFactorHadronInelastic = 1.0;
+    G4double fXSFactorNucleonElastic = 1.0;
+    G4double fXSFactorPionElastic = 1.0;
+    G4double fXSFactorHadronElastic = 1.0;
+    G4double fXSFactorEM = 1.0;
+    G4double fXSFactorLimit = 0.2;
+    
+    G4int    fVerboseLevel = 1;
+    G4bool   fEnableBC = false;
+    G4bool   fApplyFactorXS = false;
+    G4bool   fEnableCRCoalescence = false;
 };
 
 inline G4double G4HadronicParameters::GetMaxEnergy() const { 
@@ -123,6 +172,38 @@ inline G4double G4HadronicParameters::GetMaxEnergyTransitionQGS_FTF() const {
   return fMaxEnergyTransitionQGS_FTF;
 }
 
+inline G4double G4HadronicParameters::EnergyThresholdForHeavyHadrons() const {
+  return fEnergyThresholdForHeavyHadrons;
+}
+
+inline G4double G4HadronicParameters::XSFactorNucleonInelastic() const {
+  return fXSFactorNucleonInelastic;
+}
+
+inline G4double G4HadronicParameters::XSFactorNucleonElastic() const {
+  return fXSFactorNucleonElastic;
+}
+
+inline G4double G4HadronicParameters::XSFactorPionInelastic() const {
+  return fXSFactorPionInelastic;
+}
+
+inline G4double G4HadronicParameters::XSFactorPionElastic() const {
+  return fXSFactorPionElastic;
+}
+
+inline G4double G4HadronicParameters::XSFactorHadronInelastic() const {
+  return fXSFactorHadronInelastic;
+}
+
+inline G4double G4HadronicParameters::XSFactorHadronElastic() const {
+  return fXSFactorHadronElastic;
+}
+
+inline G4double G4HadronicParameters::XSFactorEM() const {
+  return fXSFactorEM;
+}
+
 inline G4int G4HadronicParameters::GetVerboseLevel() const { 
   return fVerboseLevel;
 }
@@ -131,4 +212,12 @@ inline G4bool G4HadronicParameters::EnableBCParticles() const {
   return fEnableBC;
 }
 
+inline G4bool G4HadronicParameters::ApplyFactorXS() const {
+  return fApplyFactorXS;
+}
+
+inline G4bool G4HadronicParameters::EnableCRCoalescence() const {
+  return fEnableCRCoalescence;
+}
+
 #endif

source/processes/hadronic/util/include/G4HadronicParametersMessenger.hh

@@ -39,6 +39,8 @@
 class G4UIdirectory;
 class G4UIcommand;
 class G4UIcmdWithAnInteger;
+class G4UIcmdWithADoubleAndUnit;
+class G4UIcmdWithABool;
 class G4HadronicParameters;
 
 
@@ -51,6 +53,8 @@ class G4HadronicParametersMessenger : public G4UImessenger {
     G4HadronicParameters* theHadronicParameters;
     G4UIdirectory* theDirectory;
     G4UIcmdWithAnInteger* theVerboseCmd;
+    G4UIcmdWithADoubleAndUnit* theMaxEnergyCmd;
+    G4UIcmdWithABool* theCRCoalescenceCmd;
 };
 
 #endif