Import Geant4 10.6.0 source tree

source/processes/hadronic/util/History

@@ -14,6 +14,12 @@ code and to keep track of all tags.
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
 
+06 August 2019 Alberto Ribon    (hadr-util-V10-05-02)
+--------------------------------------------------------
+- G4HadronicParameters : extended to the recommended (default) energy
+  transition regions between FTF and cascade models (BERT and/or BIC)
+  and between strings models (QGS and FTF).
+
 12 May 2019 Vladimir Ivanchenko (hadr-util-V10-05-01)
 --------------------------------------------------------
 - G4HadProjectile - clean-up for small kinetic energy of the projectile

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

@@ -59,11 +59,27 @@ class G4HadronicParameters {
     // Any application which tries to use hadronic physics for an energy higher than this limit
     // will get a run-time crash, because no model is found.
 
+    G4double GetMinEnergyTransitionFTF_Cascade() const;
+    G4double GetMaxEnergyTransitionFTF_Cascade() const;
+    // Recommended energy limits, for physics lists, of the transition region
+    // between the Fritiof (FTF) string model and the intranuclear cascade model,
+    // either Bertini (BERT) or Binary (BIC). 
+
+    G4double GetMinEnergyTransitionQGS_FTF() const;
+    G4double GetMaxEnergyTransitionQGS_FTF() const;
+    // Recommended energy limits, for physics lists, of the transition region
+    // between the two strings models - the Quark Gluon String (QGS) model and
+    // the Fritiof (FTF) model.
+
   private:
     G4HadronicParameters();
     static G4HadronicParameters* sInstance;
 
     G4double fMaxEnergy;
+    G4double fMinEnergyTransitionFTF_Cascade;
+    G4double fMaxEnergyTransitionFTF_Cascade;
+    G4double fMinEnergyTransitionQGS_FTF;
+    G4double fMaxEnergyTransitionQGS_FTF;
 };
 
 
@@ -71,5 +87,19 @@ inline G4double G4HadronicParameters::GetMaxEnergy() const {
   return fMaxEnergy;
 }
 
+inline G4double G4HadronicParameters::GetMinEnergyTransitionFTF_Cascade() const { 
+  return fMinEnergyTransitionFTF_Cascade;
+}
+inline G4double G4HadronicParameters::GetMaxEnergyTransitionFTF_Cascade() const { 
+  return fMaxEnergyTransitionFTF_Cascade;
+}
+
+inline G4double G4HadronicParameters::GetMinEnergyTransitionQGS_FTF() const { 
+  return fMinEnergyTransitionQGS_FTF;
+}
+inline G4double G4HadronicParameters::GetMaxEnergyTransitionQGS_FTF() const { 
+  return fMaxEnergyTransitionQGS_FTF;
+}
+
 #endif
 

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

@@ -42,7 +42,7 @@
     
     void dump()
     {
-      if(getenv(theName))
+      if(std::getenv(theName))
       {
         size_t i(0);
 	for(i=0; i<theS.size(); i++)

source/processes/hadronic/util/src/G4HadronicException.cc

@@ -1,3 +1,28 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
 #include "G4HadronicException.hh"
 
 #include <iostream>
@@ -11,7 +36,7 @@ G4HadronicException::G4HadronicException(G4String in, G4int at, G4String mess)
 
   G4cout << whatString;
 
-  if (getenv("DumpCoreOnHadronicException")) {
+  if (std::getenv("DumpCoreOnHadronicException")) {
     G4Exception("G4HadronicException", "007", FatalException,
                 "Fatal problem in above location");
   }

source/processes/hadronic/util/src/G4HadronicParameters.cc

@@ -61,5 +61,9 @@ G4HadronicParameters::~G4HadronicParameters() {}
 
 G4HadronicParameters::G4HadronicParameters() {
   fMaxEnergy = 100.0*CLHEP::TeV;
+  fMinEnergyTransitionFTF_Cascade = 3.0*CLHEP::GeV;
+  fMaxEnergyTransitionFTF_Cascade = 6.0*CLHEP::GeV;
+  fMinEnergyTransitionQGS_FTF = 12.0*CLHEP::GeV;
+  fMaxEnergyTransitionQGS_FTF = 25.0*CLHEP::GeV;
 }