Import Geant4 10.6.0 source tree

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++)