Import Geant4 11.4.0 source tree

source/physics_lists/builders/include/G4AntiBarionBuilder.hh

@@ -38,33 +38,15 @@
 #ifndef G4AntiBarionBuilder_h
 #define G4AntiBarionBuilder_h 1
 
-#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
-#include <vector>
 
-class G4HadronInelasticProcess;
-class G4VAntiBarionBuilder;
-
-
-class G4AntiBarionBuilder : public G4PhysicsBuilderInterface
+class G4AntiBarionBuilder
 {
   public: 
-    G4AntiBarionBuilder();
-    virtual ~G4AntiBarionBuilder() {}
-
-    virtual void Build() final override;
-    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
-
-  private:
-    G4HadronInelasticProcess* theAntiProtonInelastic;
-    G4HadronInelasticProcess* theAntiNeutronInelastic;
-    G4HadronInelasticProcess* theAntiDeuteronInelastic;
-    G4HadronInelasticProcess* theAntiTritonInelastic;
-    G4HadronInelasticProcess* theAntiHe3Inelastic;
-    G4HadronInelasticProcess* theAntiAlphaInelastic;
-     
-    std::vector<G4VAntiBarionBuilder* > theModelCollections;
+    G4AntiBarionBuilder() = default;
+    ~G4AntiBarionBuilder() = default;
 
+    void Build();
 };
 
 #endif

source/physics_lists/builders/include/G4FTFPAntiBarionBuilder.hh

@@ -40,40 +40,14 @@
 
 #include "globals.hh"
 
-#include "G4HadronElasticProcess.hh"
-#include "G4VAntiBarionBuilder.hh"
-
-#include "G4TheoFSGenerator.hh"
-#include "G4GeneratorPrecompoundInterface.hh"
-#include "G4FTFModel.hh"
-#include "G4LundStringFragmentation.hh"
-#include "G4ExcitedStringDecay.hh"
-#include "G4QuasiElasticChannel.hh"
-
-#include "G4VCrossSectionDataSet.hh"
-#include "G4VComponentCrossSection.hh"
-
-class G4FTFPAntiBarionBuilder : public G4VAntiBarionBuilder
+class G4FTFPAntiBarionBuilder
 {
   public: 
-    G4FTFPAntiBarionBuilder(G4bool quasiElastic=false);
-    virtual ~G4FTFPAntiBarionBuilder();
+    G4FTFPAntiBarionBuilder();
+    ~G4FTFPAntiBarionBuilder();
 
-    virtual void Build(G4HadronElasticProcess *) final override {}
-    virtual void Build(G4HadronInelasticProcess * aP) final override;
-    
-    virtual void SetMinEnergy(G4double val) final override {theMin = val;}
-    virtual void SetMaxEnergy(G4double val) final override {theMax = val;}
-
-    using G4VAntiBarionBuilder::Build;  //Prevent compiler warning
-
-  private:
-    G4TheoFSGenerator * theModel;
-    G4VCrossSectionDataSet* theAntiNucleonData;
-    G4double theMin;
-    G4double theMax;
-
-};
+    void Build();
+ };
 
 #endif
 

source/physics_lists/builders/include/G4FTFPProtonBuilder.hh

@@ -45,24 +45,18 @@
 #include "G4VProtonBuilder.hh"
 
 #include "G4TheoFSGenerator.hh"
-#include "G4GeneratorPrecompoundInterface.hh"
-#include "G4FTFModel.hh"
-#include "G4LundStringFragmentation.hh"
-#include "G4ExcitedStringDecay.hh"
-#include "G4QuasiElasticChannel.hh"
 
 class G4FTFPProtonBuilder : public G4VProtonBuilder
 {
   public: 
     G4FTFPProtonBuilder(G4bool quasiElastic=false);
-    virtual ~G4FTFPProtonBuilder();
+    ~G4FTFPProtonBuilder() override = default;
 
-  public: 
-    virtual void Build(G4HadronElasticProcess *) final override {};
-    virtual void Build(G4HadronInelasticProcess * aP) final override;
+    void Build(G4HadronElasticProcess *) override {};
+    void Build(G4HadronInelasticProcess * aP) override;
     
-    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
-    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+    void SetMinEnergy(G4double aM) override { theMin = aM; };
+    void SetMaxEnergy(G4double aM) override { theMax = aM; };
 
     using G4VProtonBuilder::Build; //Prevent compiler warning
 

source/physics_lists/builders/include/G4QGSPAntiBarionBuilder.hh

@@ -41,7 +41,7 @@
 #include "globals.hh"
 #include "G4VAntiBarionBuilder.hh"
 
-class G4HadronElasticProcess;
+class G4HadronInelasticProcess;
 class G4VCrossSectionDataSet;
 class G4TheoFSGenerator;
 
@@ -49,13 +49,12 @@ class G4TheoFSGenerator;
 class G4QGSPAntiBarionBuilder : public G4VAntiBarionBuilder {
   public: 
     G4QGSPAntiBarionBuilder( G4bool quasiElastic = false );
-    virtual ~G4QGSPAntiBarionBuilder() {};
+    ~G4QGSPAntiBarionBuilder() override = default;
 
-    virtual void Build( G4HadronElasticProcess* ) final override {}  
-    virtual void Build( G4HadronInelasticProcess* aP ) final override;
+    void Build( G4HadronInelasticProcess* aP );
   
-    virtual void SetMinEnergy( G4double val ) final override { theMin = val; }
-    virtual void SetMaxEnergy( G4double val ) final override { theMax = val; }
+    void SetMinEnergy( G4double val ) final override { theMin = val; }
+    void SetMaxEnergy( G4double val ) final override { theMax = val; }
 
     using G4VAntiBarionBuilder::Build;  // Prevent compiler warning
 

source/physics_lists/builders/include/G4VAntiBarionBuilder.hh

@@ -39,17 +39,18 @@
 #define G4VAntiBarionBuilder_h
 
 #include "G4PhysicsBuilderInterface.hh"
-#include "G4HadronElasticProcess.hh"
-#include "G4HadronInelasticProcess.hh"
+
+class G4HadronInelasticProcess;
+class G4HadronElasticProcess;
 
 class G4VAntiBarionBuilder : public G4PhysicsBuilderInterface
 {
 public:
   G4VAntiBarionBuilder() = default;
-  virtual ~G4VAntiBarionBuilder() {} 
-  virtual void Build(G4HadronElasticProcess * aP) = 0;
-  virtual void Build(G4HadronInelasticProcess * aP) = 0;
-  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
+  ~G4VAntiBarionBuilder() override = default;
+  //  virtual void Build(G4HadronElasticProcess * aP) = 0;
+  // virtual void Build(G4HadronInelasticProcess * aP) = 0;
+  // using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 
 #endif

source/physics_lists/builders/include/G4VProtonBuilder.hh

@@ -48,7 +48,7 @@ class G4VProtonBuilder : public G4PhysicsBuilderInterface
 {
 public:
   G4VProtonBuilder() = default;
-  virtual ~G4VProtonBuilder() {}
+  ~G4VProtonBuilder() override = default;
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4HadronInelasticProcess * aP) = 0;
   using G4PhysicsBuilderInterface::Build; //Prevent compiler warning