Import Geant4 11.1.1 source tree

source/processes/hadronic/management/History

@@ -6,6 +6,10 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2023-01-17 Vladimir Ivanchenko (hadr-man-V11-00-09)
+- G4HadronicProcess - moved several class members to be protected, which 
+    is needed for hadron elastic process (and may be other processes)
+
 ## 2022-11-26 Gabriele Cosmo (hadr-man-V11-00-08)
 - Fixed compilation warnings for implicit type conversions on macOS/XCode 14.1.
 

source/processes/hadronic/management/include/G4HadronicProcess.hh

@@ -218,16 +218,22 @@ protected:
   G4HadProjectile thePro;
 
   G4ParticleChange* theTotalResult;
+  G4CrossSectionDataStore* theCrossSectionDataStore;
+
   G4double fWeight = 1.0;
+  G4double aScaleFactor = 1.0;
+  G4double theLastCrossSection = 0.0;
+  G4double mfpKinEnergy = DBL_MAX;
   G4long epReportLevel = 0;
 
+  G4HadXSType fXSType = fHadNoIntegral;
+
 private:
     
   G4EnergyRangeManager theEnergyRangeManager;
   G4Nucleus targetNucleus;
     
   G4HadronicInteraction* theInteraction = nullptr;
-  G4CrossSectionDataStore* theCrossSectionDataStore;
   G4HadronicProcessStore* theProcessStore;
   const G4HadronicProcess* masterProcess = nullptr;
   const G4ParticleDefinition* firstParticle = nullptr;
@@ -238,14 +244,9 @@ private:
   std::vector<G4double>* theEnergyOfCrossSectionMax = nullptr;
   std::vector<G4TwoPeaksHadXS*>* fXSpeaks = nullptr;
      
-  G4double aScaleFactor = 1.0;
-  G4double theLastCrossSection = 0.0;
-  G4double mfpKinEnergy = DBL_MAX;
   G4double theMFP = DBL_MAX;
   G4double minKinEnergy;
 
-  G4HadXSType fXSType = fHadNoIntegral;
-
   // counters
   G4int nMatWarn = 0;
   G4int nKaonWarn = 0;