Import Geant4 11.2.0.beta source tree

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

@@ -210,9 +210,6 @@ private:
   G4double XBiasSurvivalProbability();
   G4double XBiasSecondaryWeight();
 
-  // Set E/p conservation check levels from environment variables
-  void GetEnergyMomentumCheckEnvvars();
-
 protected:
 
   G4HadProjectile thePro;
@@ -224,7 +221,7 @@ protected:
   G4double aScaleFactor = 1.0;
   G4double theLastCrossSection = 0.0;
   G4double mfpKinEnergy = DBL_MAX;
-  G4long epReportLevel = 0;
+  G4int epReportLevel = 0;
 
   G4HadXSType fXSType = fHadNoIntegral;
 
@@ -243,7 +240,7 @@ private:
 
   std::vector<G4double>* theEnergyOfCrossSectionMax = nullptr;
   std::vector<G4TwoPeaksHadXS*>* fXSpeaks = nullptr;
-     
+
   G4double theMFP = DBL_MAX;
   G4double minKinEnergy;
 
@@ -255,7 +252,6 @@ private:
 
   // flags
   G4bool levelsSetByProcess = false;
-  G4bool G4HadronicProcess_debug_flag = false;
   G4bool useIntegralXS = true;
   G4bool isMaster = true;
 
@@ -348,7 +344,7 @@ G4HadronicProcess::TwoPeaksXS() const
 inline std::vector<G4double>*
 G4HadronicProcess::EnergyOfCrossSectionMax() const
 {
-  return  theEnergyOfCrossSectionMax;
+  return theEnergyOfCrossSectionMax;
 }
 
 inline G4HadronicInteraction* G4HadronicProcess::

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

@@ -24,7 +24,6 @@
 // ********************************************************************
 //
 //
-//
 // -------------------------------------------------------------------
 //
 // GEANT4 Class header file
@@ -192,7 +191,7 @@ public:
 
   G4bool GetBuildXSTable() const;
 
-  void PrintInfo(const G4ParticleDefinition*); 
+  void PrintInfo(const G4ParticleDefinition*);
 
   void Dump(G4int level);
   void DumpHtml();
@@ -246,18 +245,18 @@ private:
   G4HadronicParameters* param;
 
   // counters and options
-  G4int n_proc;
-  G4int n_model;
-  G4int n_part;
-  G4int n_extra;
+  G4int n_proc = 0;
+  G4int n_model = 0;
+  G4int n_part = 0;
+  G4int n_extra = 0;
 
-  G4bool buildTableStart;
-  G4bool buildXSTable;
+  G4bool buildTableStart = true;
+  G4bool buildXSTable = false;
 
   // cache
-  HP   currentProcess;
-  PD   currentParticle;
-  PD   theGenericIon;
+  HP currentProcess = nullptr;
+  PD currentParticle = nullptr;
+  PD theGenericIon;
 
   G4DynamicParticle localDP;
 
@@ -265,4 +264,3 @@ private:
 };
 
 #endif
-