Import Geant4 10.6.0 source tree

source/processes/hadronic/models/management/include/G4HadronicInteractionRegistry.hh

@@ -75,9 +75,7 @@ private:
 
   static G4ThreadLocal G4HadronicInteractionRegistry* instance;
 
-  std::vector <G4HadronicInteraction*>  allModels;
-  G4bool isInitialized;
-
+  std::vector<G4HadronicInteraction*> allModels;
 };
 
 #endif

source/processes/hadronic/models/management/include/G4VHighEnergyGenerator.hh

@@ -37,17 +37,21 @@
 // generation of complete final states for inelastic scattering.
 // Class Description - End
 
+#include "G4HadronicInteraction.hh"
 #include "G4Nucleus.hh"
 #include "G4HadProjectile.hh"
-class G4KineticTrackVector;
 #include "G4ReactionProduct.hh"
 #include "G4V3DNucleus.hh"
 
-class G4VHighEnergyGenerator 
+class G4KineticTrackVector;
+
+class G4VHighEnergyGenerator : public G4HadronicInteraction
 {
   public:
       G4VHighEnergyGenerator(const G4String& modelName = "High Energy Generator");
-      virtual ~G4VHighEnergyGenerator();
+      ~G4VHighEnergyGenerator() override;
+
+      G4HadFinalState *ApplyYourself(const G4HadProjectile&, G4Nucleus&) final;
 
   private:
       G4VHighEnergyGenerator(const G4VHighEnergyGenerator &right);
@@ -60,16 +64,7 @@ class G4VHighEnergyGenerator
       virtual G4V3DNucleus * GetProjectileNucleus() const;  // Uzhi Nov. 2012
       virtual G4KineticTrackVector * Scatter(const G4Nucleus &theNucleus, 
                                              const G4DynamicParticle &thePrimary) = 0;
-      std::pair<G4double, G4double> GetEnergyMomentumCheckLevels() const;
-      void SetEnergyMomentumCheckLevels(G4double relativeLevel, G4double AbsoluteLevel);
-      virtual void ModelDescription(std::ostream&) const;
-      virtual G4String GetModelName() const;
-
-  private:
-      std::pair<G4double, G4double> epCheckLevels;
-
-  private:
-      G4String theGeneratorModelName;
+      void ModelDescription(std::ostream&) const override;
 
 };
 #endif