Import Geant4 10.4.0.beta source tree

source/physics_lists/builders/History

@@ -14,6 +14,24 @@ introduced in the code and keeptrack of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+26-Apr-2017, Andrea Dotti       (phys-builders-V10-03-03, -04 -05)
+- Next step in migration to new design to properly clean memory in MT mode
+  G4BuilderInterface renamed G4PhysicsBuilderInterface and moved to run
+  category
+- Coworking tag: run-V10-03-08
+
+17-Apr-2017, Andrea Dotti	    (phys-builders-V10-03-02)
+- Workaround for compilation errror for MIC (that is actually a bug in the 
+  compiler for MIC)
+
+13-Apr-2017, Andrea Dotti	    (phys-builders-V10-03-01)
+- Fix compilation warning
+
+12-Apr-2017, Andrea Dotti	    (phys-builders-V10-03-00)
+- New design with base class for all builders
+- Add c++11 compatibility
+- Removed unused class TheoModelFactory
+
 15-Apr-2016, Vladimir Ivanchenko    (phys-builders-V10-02-01)
 - OrderingParameterTable - disable msc PostStep
 

source/physics_lists/builders/include/G4AlphaBuilder.hh

@@ -30,28 +30,28 @@
 // ClassName:   G4AlphaBuilder
 //
 // Author: 2013 P. Arce
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4AlphaBuilder_h
 #define G4AlphaBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4AlphaInelasticProcess.hh"
 #include "G4VAlphaBuilder.hh"
-
 #include <vector>
 
-class G4AlphaBuilder
+class G4AlphaBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4AlphaBuilder();
-    virtual ~G4AlphaBuilder();
+    virtual ~G4AlphaBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VAlphaBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    void RegisterMe(G4PhysicsBuilderInterface * aB) final override;// {theModelCollections.push_back(aB);}
 
   private:
     G4AlphaInelasticProcess * theAlphaInelastic;

source/physics_lists/builders/include/G4AlphaPHPBuilder.hh

@@ -28,7 +28,7 @@
 // ClassName:   G4AlphaPHPBuilder
 //
 // Author: 2013 P. Arce
-//
+// 12.04.2017 A.Dotti move to new design with base class//
 //----------------------------------------------------------------------------
 //
 
@@ -47,21 +47,22 @@ class G4AlphaPHPBuilder : public G4VAlphaBuilder
 {
 public: 
   G4AlphaPHPBuilder();
-  virtual ~G4AlphaPHPBuilder();
+  virtual ~G4AlphaPHPBuilder() {}
   
-public: 
-  virtual void Build(G4AlphaInelasticProcess * aP);
-  virtual void Build(G4HadronElasticProcess * aP);
+  virtual void Build(G4AlphaInelasticProcess * aP) final override ;
+  virtual void Build(G4HadronElasticProcess * aP) final override;
   
-  void SetMinEnergy(G4double aM) 
+  virtual void SetMinEnergy(G4double aM) final override
   {
     theMin=aM;
   }
-  void SetMaxEnergy(G4double aM) 
+  virtual void SetMaxEnergy(G4double aM) final override
   {
     theMax=aM;
   }
   
+  using G4VAlphaBuilder::Build; //Prevent compiler warning
+
 private:
   G4double theMin;
   G4double theMax;

source/physics_lists/builders/include/G4AntiBarionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4AntiBarionBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4AntiBarionBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -32,27 +32,28 @@
 // Author: 2011 J. Apostolakis
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4AntiBarionBuilder_h
 #define G4AntiBarionBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4ProtonInelasticProcess.hh"
 #include "G4VAntiBarionBuilder.hh"
-
 #include <vector>
 
-class G4AntiBarionBuilder
+class G4AntiBarionBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4AntiBarionBuilder();
-    virtual ~G4AntiBarionBuilder();
+    virtual ~G4AntiBarionBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VAntiBarionBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4AntiProtonInelasticProcess*   theAntiProtonInelastic;

source/physics_lists/builders/include/G4BertiniKaonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniKaonBuilder.hh 67969 2013-03-13 09:44:42Z gcosmo $
+// $Id: G4BertiniKaonBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //  devired from G4BertiniPionBuilder
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,18 +54,19 @@ class G4BertiniKaonBuilder : public G4VKaonBuilder
 {
   public: 
     G4BertiniKaonBuilder();
-    virtual ~G4BertiniKaonBuilder();
+    virtual ~G4BertiniKaonBuilder() {}
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
 
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
 
+    using G4VKaonBuilder::Build; //Prevent compier warning
   private:
     G4VCrossSectionDataSet * ChipsKaonMinus;
     G4VCrossSectionDataSet * ChipsKaonPlus;

source/physics_lists/builders/include/G4BertiniNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniNeutronBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BertiniNeutronBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,16 +54,17 @@ class G4BertiniNeutronBuilder : public G4VNeutronBuilder
 {
   public: 
     G4BertiniNeutronBuilder();
-    virtual ~G4BertiniNeutronBuilder();
+    virtual ~G4BertiniNeutronBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VNeutronBuilder::Build;
 
   private:
     G4CascadeInterface * theModel;    

source/physics_lists/builders/include/G4BertiniPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniPiKBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BertiniPiKBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -54,19 +55,20 @@ class G4BertiniPiKBuilder : public G4VPiKBuilder
 {
   public: 
     G4BertiniPiKBuilder();
-    virtual ~G4BertiniPiKBuilder();
+    virtual ~G4BertiniPiKBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VPiKBuilder::Build; //Prevent Compilation warning
 
   private:
     G4PiNuclearCrossSection* thePiData;

source/physics_lists/builders/include/G4BertiniPionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniPionBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BertiniPionBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,6 +34,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -49,22 +50,22 @@
 #include "G4VPionBuilder.hh"
 
 #include "G4PiNuclearCrossSection.hh"
-#include "G4CascadeInterface.hh"   
+#include "G4CascadeInterface.hh"
 
 class G4BertiniPionBuilder : public G4VPionBuilder
 {
   public: 
     G4BertiniPionBuilder();
-    virtual ~G4BertiniPionBuilder();
+    virtual ~G4BertiniPionBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
 
+    using G4VPionBuilder::Build; //Prevent compiler warning
   private:
     G4PiNuclearCrossSection* thePiData;
     G4CascadeInterface * theModel;    

source/physics_lists/builders/include/G4BertiniProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniProtonBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BertiniProtonBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,17 +54,17 @@ class G4BertiniProtonBuilder : public G4VProtonBuilder
 {
   public: 
     G4BertiniProtonBuilder();
-    virtual ~G4BertiniProtonBuilder();
+    virtual ~G4BertiniProtonBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VProtonBuilder::Build; //Prevent compiler warning
 
   private:
-
     G4CascadeInterface * theModel;    
     G4double theMin;
     G4double theMax;

source/physics_lists/builders/include/G4BinaryAlphaBuilder.hh

@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,14 +54,15 @@ class G4BinaryAlphaBuilder : public G4VAlphaBuilder
 {
   public: 
     G4BinaryAlphaBuilder();
-    virtual ~G4BinaryAlphaBuilder();
+    virtual ~G4BinaryAlphaBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4AlphaInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess * ) final override {};
+    virtual void Build(G4AlphaInelasticProcess * aP) final override ;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override  {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override  {theMax = aM;}
+
+    using G4VAlphaBuilder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4BinaryDeuteronBuilder.hh

@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,14 +54,15 @@ class G4BinaryDeuteronBuilder : public G4VDeuteronBuilder
 {
   public: 
     G4BinaryDeuteronBuilder();
-    virtual ~G4BinaryDeuteronBuilder();
+    virtual ~G4BinaryDeuteronBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4DeuteronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4DeuteronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VDeuteronBuilder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4BinaryHe3Builder.hh

@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,14 +54,15 @@ class G4BinaryHe3Builder : public G4VHe3Builder
 {
   public: 
     G4BinaryHe3Builder();
-    virtual ~G4BinaryHe3Builder();
+    virtual ~G4BinaryHe3Builder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4He3InelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4He3InelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VHe3Builder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4BinaryNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryNeutronBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BinaryNeutronBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,17 +54,17 @@ class G4BinaryNeutronBuilder : public G4VNeutronBuilder
 {
   public: 
     G4BinaryNeutronBuilder();
-    virtual ~G4BinaryNeutronBuilder();
+    virtual ~G4BinaryNeutronBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
 
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
   private:
     G4BinaryCascade * theModel;    
     G4double theMin;

source/physics_lists/builders/include/G4BinaryPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryPiKBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BinaryPiKBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -54,19 +55,20 @@ class G4BinaryPiKBuilder : public G4VPiKBuilder
 {
   public: 
     G4BinaryPiKBuilder();
-    virtual ~G4BinaryPiKBuilder();
+    virtual ~G4BinaryPiKBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess *) final override {}
+    virtual void Build(G4KaonMinusInelasticProcess *) final override {}
+    virtual void Build(G4KaonZeroLInelasticProcess *) final override {}
+    virtual void Build(G4KaonZeroSInelasticProcess *) final override {}
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VPiKBuilder::Build; //Prevent compiler warning
 
   private:
     G4PiNuclearCrossSection* thePiData;

source/physics_lists/builders/include/G4BinaryPionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryPionBuilder.hh 67969 2013-03-13 09:44:42Z gcosmo $
+// $Id: G4BinaryPionBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -31,6 +31,8 @@
 //
 // Author: 2011 Gunter Folger
 //
+// Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -52,16 +54,16 @@ class G4BinaryPionBuilder : public G4VPionBuilder
 {
   public: 
     G4BinaryPionBuilder();
-    virtual ~G4BinaryPionBuilder();
+    virtual ~G4BinaryPionBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    void SetMaxEnergy(G4double aM) final override {theMax = aM;}
 
+    using G4VPionBuilder::Build; //Prevent compiler warning
   private:
     G4VCrossSectionDataSet * thePiData;
     G4BinaryCascade * theModel;    

source/physics_lists/builders/include/G4BinaryProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryProtonBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BinaryProtonBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,7 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
-//
+// 12.04.2017 A.Dotti move to new design with base class
 //----------------------------------------------------------------------------
 //
 #ifndef G4BinaryProtonBuilder_h
@@ -53,14 +53,15 @@ class G4BinaryProtonBuilder : public G4VProtonBuilder
 {
   public: 
     G4BinaryProtonBuilder();
-    virtual ~G4BinaryProtonBuilder();
+    virtual ~G4BinaryProtonBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VProtonBuilder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4BinaryTritonBuilder.hh

@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -53,14 +54,15 @@ class G4BinaryTritonBuilder : public G4VTritonBuilder
 {
   public: 
     G4BinaryTritonBuilder();
-    virtual ~G4BinaryTritonBuilder();
+    virtual ~G4BinaryTritonBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4TritonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4TritonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VTritonBuilder::Build; //Prvent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4BuilderType.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BuilderType.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BuilderType.hh 66241 2012-12-13 18:34:42Z gunter $
 //
 //---------------------------------------------------------------
 //

source/physics_lists/builders/include/G4DeuteronBuilder.hh

@@ -31,27 +31,29 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4DeuteronBuilder_h
 #define G4DeuteronBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4DeuteronInelasticProcess.hh"
 #include "G4VDeuteronBuilder.hh"
-
 #include <vector>
 
-class G4DeuteronBuilder
+class G4DeuteronBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4DeuteronBuilder();
-    virtual ~G4DeuteronBuilder();
+    virtual ~G4DeuteronBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VDeuteronBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4DeuteronInelasticProcess * theDeuteronInelastic;

source/physics_lists/builders/include/G4DeuteronPHPBuilder.hh

@@ -29,6 +29,9 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 
@@ -47,21 +50,23 @@ class G4DeuteronPHPBuilder : public G4VDeuteronBuilder
 {
 public: 
   G4DeuteronPHPBuilder();
-  virtual ~G4DeuteronPHPBuilder();
+  virtual ~G4DeuteronPHPBuilder() {}
   
 public: 
-  virtual void Build(G4DeuteronInelasticProcess * aP);
-  virtual void Build(G4HadronElasticProcess * aP);
+  virtual void Build(G4DeuteronInelasticProcess * aP) final override;
+  virtual void Build(G4HadronElasticProcess * aP) final override;
   
-  void SetMinEnergy(G4double aM) 
+  virtual void SetMinEnergy(G4double aM) final override
   {
     theMin=aM;
   }
-  void SetMaxEnergy(G4double aM) 
+  virtual void SetMaxEnergy(G4double aM) final override
   {
     theMax=aM;
   }
   
+  using G4VDeuteronBuilder::Build; //Prevent compiler warning
+
 private:
   G4double theMin;
   G4double theMax;

source/physics_lists/builders/include/G4FTFBinaryKaonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryKaonBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFBinaryKaonBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -31,7 +31,8 @@
 //
 // Author: 2008 G.Folger
 //
-//
+// Modified:
+// 12.04.2017 A.Dotti move to new design with base class//
 //----------------------------------------------------------------------------
 //
 #ifndef G4FTFBinaryKaonBuilder_h
@@ -59,15 +60,16 @@ class G4FTFBinaryKaonBuilder : public G4VKaonBuilder
     G4FTFBinaryKaonBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFBinaryKaonBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VKaonBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFBinaryNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryNeutronBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFBinaryNeutronBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -60,14 +61,15 @@ class G4FTFBinaryNeutronBuilder : public G4VNeutronBuilder
     G4FTFBinaryNeutronBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFBinaryNeutronBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFBinaryPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryPiKBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFBinaryPiKBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -61,16 +62,17 @@ class G4FTFBinaryPiKBuilder : public G4VPiKBuilder
     G4FTFBinaryPiKBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFBinaryPiKBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VPiKBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFBinaryPionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryPionBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFBinaryPionBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -31,6 +31,8 @@
 //
 // Author: 2011 G.Folger
 //
+// Modificed:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -59,13 +61,14 @@ class G4FTFBinaryPionBuilder : public G4VPionBuilder
     G4FTFBinaryPionBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFBinaryPionBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VPionBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFBinaryProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryProtonBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFBinaryProtonBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -60,13 +61,12 @@ class G4FTFBinaryProtonBuilder : public G4VProtonBuilder
     G4FTFBinaryProtonBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFBinaryProtonBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
-
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+    using G4VProtonBuilder::Build; //Prevent compiler warning
   private:
     G4TheoFSGenerator * theModel;
     G4BinaryCascade * theCascade;

source/physics_lists/builders/include/G4FTFPAntiBarionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPAntiBarionBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $ 
+// $Id: G4FTFPAntiBarionBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $ 
 // GEANT4 tag $Name: $
 //
 //---------------------------------------------------------------------------
@@ -33,6 +33,7 @@
 // Author: 2011 J. Apostolakis
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -62,17 +63,18 @@ class G4FTFPAntiBarionBuilder : public G4VAntiBarionBuilder
     G4FTFPAntiBarionBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFPAntiBarionBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4AntiProtonInelasticProcess * aP);
-    virtual void Build(G4AntiNeutronInelasticProcess * aP);
-    virtual void Build(G4AntiDeuteronInelasticProcess * aP);
-    virtual void Build(G4AntiTritonInelasticProcess * aP);
-    virtual void Build(G4AntiHe3InelasticProcess * aP);
-    virtual void Build(G4AntiAlphaInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4AntiProtonInelasticProcess * aP) final override;
+    virtual void Build(G4AntiNeutronInelasticProcess * aP) final override;
+    virtual void Build(G4AntiDeuteronInelasticProcess * aP) final override;
+    virtual void Build(G4AntiTritonInelasticProcess * aP) final override;
+    virtual void Build(G4AntiHe3InelasticProcess * aP) final override;
+    virtual void Build(G4AntiAlphaInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double val) {theMin = val;}
-    void SetMaxEnergy(G4double val) {theMax = val;}
+    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;

source/physics_lists/builders/include/G4FTFPKaonBuilder.hh

@@ -34,6 +34,7 @@
 // Description: Modified version of G4FTFPPiKBuilder to include on kaons.
 //
 // Modified
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -60,15 +61,16 @@ class G4FTFPKaonBuilder : public G4VKaonBuilder
     G4FTFPKaonBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFPKaonBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override{theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VKaonBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFPNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPNeutronBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFPNeutronBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -61,13 +62,15 @@ class G4FTFPNeutronBuilder : public G4VNeutronBuilder
     virtual ~G4FTFPNeutronBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFPPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPPiKBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFPPiKBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -63,16 +64,18 @@ class G4FTFPPiKBuilder : public G4VPiKBuilder
     virtual ~G4FTFPPiKBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VPiKBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFPPionBuilder.hh

@@ -35,6 +35,8 @@
 //
 // Modified:
 //
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4FTFPPionBuilder_h
@@ -60,13 +62,14 @@ class G4FTFPPionBuilder : public G4VPionBuilder
     G4FTFPPionBuilder(G4bool quasiElastic=false);
     virtual ~G4FTFPPionBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VPionBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4FTFPProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPProtonBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFPProtonBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -61,11 +61,13 @@ class G4FTFPProtonBuilder : public G4VProtonBuilder
     virtual ~G4FTFPProtonBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VProtonBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4He3Builder.hh

@@ -31,27 +31,28 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+//// 12.04.2017 A.Dotti move to new design with base class
 //----------------------------------------------------------------------------
 //
 #ifndef G4He3Builder_h
 #define G4He3Builder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4He3InelasticProcess.hh"
 #include "G4VHe3Builder.hh"
-
 #include <vector>
 
-class G4He3Builder
+class G4He3Builder : public G4PhysicsBuilderInterface
 {
   public: 
     G4He3Builder();
-    virtual ~G4He3Builder();
+    virtual ~G4He3Builder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VHe3Builder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4He3InelasticProcess * theHe3Inelastic;

source/physics_lists/builders/include/G4He3PHPBuilder.hh

@@ -29,6 +29,9 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 
@@ -47,21 +50,22 @@ class G4He3PHPBuilder : public G4VHe3Builder
 {
 public: 
   G4He3PHPBuilder();
-  virtual ~G4He3PHPBuilder();
+  virtual ~G4He3PHPBuilder() {}
   
-public: 
-  virtual void Build(G4He3InelasticProcess * aP);
-  virtual void Build(G4HadronElasticProcess * aP);
+  virtual void Build(G4He3InelasticProcess * aP) final override;
+  virtual void Build(G4HadronElasticProcess * aP) final override;
   
-  void SetMinEnergy(G4double aM) 
+  virtual void SetMinEnergy(G4double aM) final override
   {
     theMin=aM;
   }
-  void SetMaxEnergy(G4double aM) 
+  virtual void SetMaxEnergy(G4double aM) final override
   {
     theMax=aM;
   }
   
+  using G4VHe3Builder::Build; //Prevent compiler warning
+
 private:
   G4double theMin;
   G4double theMax;

source/physics_lists/builders/include/G4HyperonFTFPBuilder.hh

@@ -32,12 +32,14 @@
 // Author: 2012 G.Folger
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4HyperonFTFPBuilder_h
 #define G4HyperonFTFPBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4LambdaInelasticProcess.hh"
@@ -59,16 +61,16 @@
 #include "G4LundStringFragmentation.hh"
 #include "G4ExcitedStringDecay.hh"
 #include "G4CascadeInterface.hh"
-
 #include "G4ChipsHyperonInelasticXS.hh"
-class G4HyperonFTFPBuilder 
+
+
+class G4HyperonFTFPBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4HyperonFTFPBuilder();
     virtual ~G4HyperonFTFPBuilder();
 
-  public: 
-    void Build();
+    virtual void Build() final override;
 
   private:
  

source/physics_lists/builders/include/G4INCLXXNeutronBuilder.hh

@@ -55,22 +55,23 @@ class G4INCLXXNeutronBuilder : public G4VNeutronBuilder
 {
   public: 
     G4INCLXXNeutronBuilder();
-    virtual ~G4INCLXXNeutronBuilder();
+    virtual ~G4INCLXXNeutronBuilder() {}
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
 
     void SetMinPreCompoundEnergy(G4double aM) {thePreCompoundMin = aM;}
     void SetMaxPreCompoundEnergy(G4double aM) {thePreCompoundMax = aM;}
 
     void UsePreCompound(const G4bool w) { withPreCompound = w;}
 
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
   private:
     G4INCLXXInterface * theModel;    
     G4VPreCompoundModel * thePreCompoundModel;    

source/physics_lists/builders/include/G4INCLXXPionBuilder.hh

@@ -58,16 +58,16 @@ class G4INCLXXPionBuilder : public G4VPionBuilder
 {
   public: 
     G4INCLXXPionBuilder();
-    virtual ~G4INCLXXPionBuilder();
+    virtual ~G4INCLXXPionBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
 
-    void SetMinEnergy(G4double aM) {theMin = aM;}
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
 
+    using G4VPionBuilder::Build; //Prevent compiler warning
   private:
     G4VCrossSectionDataSet* thePiData;
     G4INCLXXInterface * theModel;    

source/physics_lists/builders/include/G4INCLXXProtonBuilder.hh

@@ -55,30 +55,31 @@ class G4INCLXXProtonBuilder : public G4VProtonBuilder
 {
   public: 
     G4INCLXXProtonBuilder();
-    virtual ~G4INCLXXProtonBuilder();
+    virtual ~G4INCLXXProtonBuilder() {}
 
-  public: 
   /**
    * Build elastic process.
    *
    * No elastic process is built.
    */
-    virtual void Build(G4HadronElasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
 
   /**
    * Build inelastic process.
    */
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
   /**
    * Set the minimum energy limit for the model.
    */
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
 
   /**
    * Set the maximum energy limit for the model.
    */
-    void SetMaxEnergy(G4double aM) {theMax = aM;}
+    virtual void SetMaxEnergy(G4double aM) final override {theMax = aM;}
+
+    using G4VProtonBuilder::Build; //Prevent compiler warning
 
   private:
     G4INCLXXInterface * theModel;    

source/physics_lists/builders/include/G4KaonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4KaonBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4KaonBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,29 +34,29 @@
 //
 // Modified:
 // 16.11.2005 G.Folger: don't  keep processes as data members, but new these
-// 13.06.2006 G.Folger: (re)move elastic scatterring 
+// 13.06.2006 G.Folger: (re)move elastic scatterring
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4KaonBuilder_h
 #define G4KaonBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4ProtonInelasticProcess.hh"
 #include "G4VKaonBuilder.hh"
-
 #include <vector>
 
-class G4KaonBuilder
+class G4KaonBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4KaonBuilder();
-    virtual ~G4KaonBuilder();
+    virtual ~G4KaonBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VKaonBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4KaonPlusInelasticProcess*  theKaonPlusInelastic;

source/physics_lists/builders/include/G4NeutronBuilder.hh

@@ -33,30 +33,31 @@
 // Modified:
 // 16.11.2005 G.Folger: don't  keep processes as data members, but new these
 // 13.06.2006 G.Folger: (re)move elastic scatterring 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4NeutronBuilder_h
 #define G4NeutronBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4HadronFissionProcess.hh"
 #include "G4HadronCaptureProcess.hh"
 #include "G4NeutronInelasticProcess.hh"
 #include "G4VNeutronBuilder.hh"
-
 #include <vector>
 
-class G4NeutronBuilder
+class G4NeutronBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4NeutronBuilder(G4bool fissionFlag = false);
-    virtual ~G4NeutronBuilder();
+    virtual ~G4NeutronBuilder() {}
 
   public: 
-    void Build();
-    void RegisterMe(G4VNeutronBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4NeutronInelasticProcess * theNeutronInelastic;

source/physics_lists/builders/include/G4NeutronLENDBuilder.hh

@@ -47,24 +47,23 @@ class G4NeutronLENDBuilder : public G4VNeutronBuilder
 {
   public: 
     G4NeutronLENDBuilder(G4String eva="");
-    virtual ~G4NeutronLENDBuilder();
+    virtual ~G4NeutronLENDBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess * aP) final override;
+    virtual void Build(G4HadronFissionProcess * aP) final override;
+    virtual void Build(G4HadronCaptureProcess * aP) final override;
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
 
-    void SetMinEnergy(G4double aM) 
+    virtual void SetMinEnergy(G4double aM) final override
     {
       theMin=aM;
       theIMin = theMin;
     }
-    void SetMinInelasticEnergy(G4double aM) 
+    void SetMinInelasticEnergy(G4double aM)
     {
       theIMin=aM;
     }
-    void SetMaxEnergy(G4double aM) 
+    virtual void SetMaxEnergy(G4double aM) final override
     {
       theIMax = aM;
       theMax=aM;
@@ -74,6 +73,7 @@ class G4NeutronLENDBuilder : public G4VNeutronBuilder
       theIMax = aM;
     }
 
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4NeutronPHPBuilder.hh

@@ -47,15 +47,15 @@ class G4NeutronPHPBuilder : public G4VNeutronBuilder
 {
   public: 
     G4NeutronPHPBuilder();
-    virtual ~G4NeutronPHPBuilder();
+    virtual ~G4NeutronPHPBuilder() {}
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess * aP) final override;
+    virtual void Build(G4HadronFissionProcess * aP) final override;
+    virtual void Build(G4HadronCaptureProcess * aP) final override;
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
 
-    void SetMinEnergy(G4double aM) 
+    virtual void SetMinEnergy(G4double aM) final override
     {
       theMin=aM;
       theIMin = theMin;
@@ -64,7 +64,7 @@ class G4NeutronPHPBuilder : public G4VNeutronBuilder
     {
       theIMin=aM;
     }
-    void SetMaxEnergy(G4double aM) 
+    virtual void SetMaxEnergy(G4double aM) final override
     {
       theIMax = aM;
       theMax=aM;
@@ -74,6 +74,7 @@ class G4NeutronPHPBuilder : public G4VNeutronBuilder
       theIMax = aM;
     }
 
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4PiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4PiKBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4PiKBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,28 +34,28 @@
 // Modified:
 // 16.11.2005 G.Folger: don't  keep processes as data members, but new these
 // 13.06.2006 G.Folger: (re)move elastic scatterring 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4PiKBuilder_h
 #define G4PiKBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4ProtonInelasticProcess.hh"
 #include "G4VPiKBuilder.hh"
-
 #include <vector>
 
-class G4PiKBuilder
+class G4PiKBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4PiKBuilder();
-    virtual ~G4PiKBuilder();
+    virtual ~G4PiKBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VPiKBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4PionPlusInelasticProcess*  thePionPlusInelastic;

source/physics_lists/builders/include/G4PionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4PionBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4PionBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,27 +33,27 @@
 //  devired from G4PiKBuilder
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4PionBuilder_h
 #define G4PionBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4VPionBuilder.hh"
-
 #include <vector>
 
-class G4PionBuilder
+class G4PionBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4PionBuilder();
-    virtual ~G4PionBuilder();
+    virtual ~G4PionBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VPionBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
 
   private:
     G4PionPlusInelasticProcess*  thePionPlusInelastic;

source/physics_lists/builders/include/G4PrecoNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4PrecoNeutronBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4PrecoNeutronBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -55,15 +56,16 @@ class G4PrecoNeutronBuilder : public G4VNeutronBuilder
 {
   public: 
     G4PrecoNeutronBuilder();
-    virtual ~G4PrecoNeutronBuilder();
+    virtual ~G4PrecoNeutronBuilder() {}
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VNeutronBuilder::Build; //Prevent Compiler warning
 
   private:
     G4PreCompoundModel * theModel;   

source/physics_lists/builders/include/G4PrecoProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4PrecoProtonBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4PrecoProtonBuilder.hh 103593 2017-04-19 08:10:21Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -53,13 +53,15 @@ class G4PrecoProtonBuilder : public G4VProtonBuilder
 {
   public: 
     G4PrecoProtonBuilder();
-    virtual ~G4PrecoProtonBuilder();
+    virtual ~G4PrecoProtonBuilder() {}
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VProtonBuilder::Build; //Prevent compiler warning
 
   private:
 

source/physics_lists/builders/include/G4ProtonBuilder.hh

@@ -33,28 +33,29 @@
 // Modified:
 // 16.11.2005 G.Folger: don't  keep processes as data members, but new these
 // 13.06.2006 G.Folger: (re)move elastic scatterring 
+// 09.04.2017 A.Dotti: adding inheritance
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4ProtonBuilder_h
 #define G4ProtonBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4ProtonInelasticProcess.hh"
 #include "G4VProtonBuilder.hh"
-
 #include <vector>
+#include <type_traits>
 
-class G4ProtonBuilder
+class G4ProtonBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4ProtonBuilder();
-    virtual ~G4ProtonBuilder();
+    virtual ~G4ProtonBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VProtonBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface* aB) final override;
 
   private:
     G4ProtonInelasticProcess * theProtonInelastic;

source/physics_lists/builders/include/G4ProtonPHPBuilder.hh

@@ -47,21 +47,22 @@ class G4ProtonPHPBuilder : public G4VProtonBuilder
 {
 public: 
   G4ProtonPHPBuilder();
-  virtual ~G4ProtonPHPBuilder();
+  virtual ~G4ProtonPHPBuilder() {}
   
-public: 
-  virtual void Build(G4ProtonInelasticProcess * aP);
-  virtual void Build(G4HadronElasticProcess * aP);
+  virtual void Build(G4ProtonInelasticProcess * aP) final override;
+  virtual void Build(G4HadronElasticProcess * aP) final override;
   
-  void SetMinEnergy(G4double aM) 
+  virtual void SetMinEnergy(G4double aM) final override
   {
     theMin=aM;
   }
-  void SetMaxEnergy(G4double aM) 
+  virtual void SetMaxEnergy(G4double aM) final override
   {
     theMax=aM;
   }
   
+  using G4VProtonBuilder::Build; //Prevent compiler warning
+
 private:
   G4double theMin;
   G4double theMax;

source/physics_lists/builders/include/G4QGSBinaryKaonBuilder.hh

@@ -34,6 +34,7 @@
 // Description: Modified version of G4QGSBinaryPiKBuilder to include on kaons.
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -61,13 +62,15 @@ class G4QGSBinaryKaonBuilder : public G4VKaonBuilder
     virtual ~G4QGSBinaryKaonBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {};
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VKaonBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4QGSBinaryNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSBinaryNeutronBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4QGSBinaryNeutronBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -61,13 +62,14 @@ class G4QGSBinaryNeutronBuilder : public G4VNeutronBuilder
     G4QGSBinaryNeutronBuilder(G4bool quasiElastic=false);
     virtual ~G4QGSBinaryNeutronBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4QGSBinaryPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSBinaryPiKBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4QGSBinaryPiKBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -63,16 +64,17 @@ class G4QGSBinaryPiKBuilder : public G4VPiKBuilder
     G4QGSBinaryPiKBuilder(G4bool quasiElastic=false);
     virtual ~G4QGSBinaryPiKBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VPiKBuilder::Build; //Prevent compiler warning
 
   private:
     G4VCrossSectionDataSet* thePiData;

source/physics_lists/builders/include/G4QGSBinaryPionBuilder.hh

@@ -34,6 +34,7 @@
 // Description: Modified version of G4QGSBinaryPiKBuilder to include on pions.
 //
 // Modified
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -62,11 +63,13 @@ class G4QGSBinaryPionBuilder : public G4VPionBuilder
     virtual ~G4QGSBinaryPionBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VPionBuilder::Build; //Prevent compiler warning
 
   private:
     G4VCrossSectionDataSet* thePiData;

source/physics_lists/builders/include/G4QGSBinaryProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSBinaryProtonBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4QGSBinaryProtonBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -61,12 +61,12 @@ class G4QGSBinaryProtonBuilder : public G4VProtonBuilder
     G4QGSBinaryProtonBuilder(G4bool quasiElastic=false);
     virtual ~G4QGSBinaryProtonBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
 
+    using G4VProtonBuilder::Build; //Prevent compiler warning
   private:
 
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4QGSPKaonBuilder.hh

@@ -34,6 +34,7 @@
 // Description: Modified version of G4QGSBinaryKaonBuilder to use PreCompound
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -61,14 +62,15 @@ class G4QGSPKaonBuilder : public G4VKaonBuilder
     virtual ~G4QGSPKaonBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
 
+    using G4VKaonBuilder::Build; //Prevent compiler warning
   private:
     G4TheoFSGenerator * theModel;
     G4GeneratorPrecompoundInterface * theCascade;

source/physics_lists/builders/include/G4QGSPLundStrFragmProtonBuilder.hh

@@ -29,6 +29,7 @@
 // ClassName:   G4QGSPLundStrFragmProtonBuilder
 //
 // Author: Julia Yarba, FNAL/CD (2014)
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -60,11 +61,12 @@ class G4QGSPLundStrFragmProtonBuilder : public G4VProtonBuilder
     virtual ~G4QGSPLundStrFragmProtonBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4ProtonInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
 
+    using G4VProtonBuilder::Build; //Prevent compiler warning
   private:
 
     G4TheoFSGenerator*               theModel;

source/physics_lists/builders/include/G4QGSPNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSPNeutronBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4QGSPNeutronBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -62,12 +63,14 @@ class G4QGSPNeutronBuilder : public G4VNeutronBuilder
     virtual ~G4QGSPNeutronBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4HadronFissionProcess * aP);
-    virtual void Build(G4HadronCaptureProcess * aP);
-    virtual void Build(G4NeutronInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4HadronFissionProcess *) final override {}
+    virtual void Build(G4HadronCaptureProcess *) final override {}
+    virtual void Build(G4NeutronInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VNeutronBuilder::Build; //Prevent compiler warning
 
   private:
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4QGSPPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSPPiKBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4QGSPPiKBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -62,16 +63,17 @@ class G4QGSPPiKBuilder : public G4VPiKBuilder
     G4QGSPPiKBuilder(G4bool quasiElastic=false);
     virtual ~G4QGSPPiKBuilder();
 
-  public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
-    virtual void Build(G4KaonPlusInelasticProcess * aP);
-    virtual void Build(G4KaonMinusInelasticProcess * aP);
-    virtual void Build(G4KaonZeroLInelasticProcess * aP);
-    virtual void Build(G4KaonZeroSInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonPlusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonMinusInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroLInelasticProcess * aP) final override;
+    virtual void Build(G4KaonZeroSInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VPiKBuilder::Build; //Prevent compiler warning
 
   private:
     G4VCrossSectionDataSet* thePiData;

source/physics_lists/builders/include/G4QGSPPionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSPPionBuilder.hh 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4QGSPPionBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //  devired from G4QGSPPiKBuilder
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -62,11 +63,13 @@ class G4QGSPPionBuilder : public G4VPionBuilder
     virtual ~G4QGSPPionBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4PionPlusInelasticProcess * aP);
-    virtual void Build(G4PionMinusInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *) final override {}
+    virtual void Build(G4PionPlusInelasticProcess * aP) final override;
+    virtual void Build(G4PionMinusInelasticProcess * aP) final override;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
+
+    using G4VPionBuilder::Build; //Prevent compiler warning
 
   private:
     G4VCrossSectionDataSet* thePiData;

source/physics_lists/builders/include/G4QGSPProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4QGSPProtonBuilder.hh 83616 2014-09-04 13:30:16Z gcosmo $
+// $Id: G4QGSPProtonBuilder.hh 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -62,11 +63,12 @@ class G4QGSPProtonBuilder : public G4VProtonBuilder
     virtual ~G4QGSPProtonBuilder();
 
   public: 
-    virtual void Build(G4HadronElasticProcess * aP);
-    virtual void Build(G4ProtonInelasticProcess * aP);
+    virtual void Build(G4HadronElasticProcess *)  final override {}
+    virtual void Build(G4ProtonInelasticProcess * aP)  final override ;
     
-    void SetMinEnergy(G4double aM) {theMin = aM;}
+    virtual void SetMinEnergy(G4double aM) final override {theMin = aM;}
 
+    using G4VProtonBuilder::Build; //Prevent compiler warning
   private:
 
     G4TheoFSGenerator * theModel;

source/physics_lists/builders/include/G4TritonBuilder.hh

@@ -31,27 +31,31 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4TritonBuilder_h
 #define G4TritonBuilder_h 1
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "globals.hh"
 
 #include "G4TritonInelasticProcess.hh"
 #include "G4VTritonBuilder.hh"
-
 #include <vector>
 
-class G4TritonBuilder
+class G4TritonBuilder : public G4PhysicsBuilderInterface
 {
   public: 
     G4TritonBuilder();
-    virtual ~G4TritonBuilder();
+    virtual ~G4TritonBuilder() {}
 
-  public: 
-    void Build();
-    void RegisterMe(G4VTritonBuilder * aB) {theModelCollections.push_back(aB);}
+    virtual void Build() final override;
+    virtual void RegisterMe(G4PhysicsBuilderInterface * aB) final override;
+
+    using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 
   private:
     G4TritonInelasticProcess * theTritonInelastic;

source/physics_lists/builders/include/G4TritonPHPBuilder.hh

@@ -29,6 +29,9 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 
@@ -47,21 +50,23 @@ class G4TritonPHPBuilder : public G4VTritonBuilder
 {
 public: 
   G4TritonPHPBuilder();
-  virtual ~G4TritonPHPBuilder();
+  virtual ~G4TritonPHPBuilder() {}
   
 public: 
-  virtual void Build(G4TritonInelasticProcess * aP);
-  virtual void Build(G4HadronElasticProcess * aP);
+  virtual void Build(G4TritonInelasticProcess * aP) final override;
+  virtual void Build(G4HadronElasticProcess * aP) final override;
   
-  void SetMinEnergy(G4double aM) 
+  virtual void SetMinEnergy(G4double aM) final override
   {
     theMin=aM;
   }
-  void SetMaxEnergy(G4double aM) 
+  virtual void SetMaxEnergy(G4double aM) final override
   {
     theMax=aM;
   }
   
+  using G4VTritonBuilder::Build; //Prevent compiler warning
+
 private:
   G4double theMin;
   G4double theMax;

source/physics_lists/builders/include/G4VAlphaBuilder.hh

@@ -28,22 +28,26 @@
 // ClassName:   G4VAlphaBuilder
 //
 // Author: 2013 P. Arce
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4VAlphaBuilder_h
 #define G4VAlphaBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
+
 class G4AlphaInelasticProcess;
 class G4HadronElasticProcess;
 
-class G4VAlphaBuilder
+class G4VAlphaBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VAlphaBuilder();
-  virtual ~G4VAlphaBuilder();
+  G4VAlphaBuilder() = default;
+  virtual ~G4VAlphaBuilder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4AlphaInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build;
 };
 
 #endif

source/physics_lists/builders/include/G4VAntiBarionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4VAntiBarionBuilder.hh 67969 2013-03-13 09:44:42Z gcosmo $
+// $Id: G4VAntiBarionBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 // GEANT4 tag $Name: $
 //
 //---------------------------------------------------------------------------
@@ -33,12 +33,14 @@
 // Author: 2011 J. Apostolakis
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4VAntiBarionBuilder_h
 #define G4VAntiBarionBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "G4HadronElasticProcess.hh"
 #include "G4AntiProtonInelasticProcess.hh"
 #include "G4AntiNeutronInelasticProcess.hh"
@@ -47,11 +49,11 @@
 #include "G4AntiHe3InelasticProcess.hh"
 #include "G4AntiAlphaInelasticProcess.hh"
 
-class G4VAntiBarionBuilder
+class G4VAntiBarionBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VAntiBarionBuilder();
-  virtual ~G4VAntiBarionBuilder();
+  G4VAntiBarionBuilder() = default;
+  virtual ~G4VAntiBarionBuilder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4AntiProtonInelasticProcess * aP) = 0;
   virtual void Build(G4AntiNeutronInelasticProcess * aP) = 0;
@@ -59,6 +61,7 @@ public:
   virtual void Build(G4AntiTritonInelasticProcess * aP) = 0;
   virtual void Build(G4AntiHe3InelasticProcess * aP) = 0;
   virtual void Build(G4AntiAlphaInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 
 #endif

source/physics_lists/builders/include/G4VDeuteronBuilder.hh

@@ -29,21 +29,27 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4VDeuteronBuilder_h
 #define G4VDeuteronBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
+
 class G4DeuteronInelasticProcess;
 class G4HadronElasticProcess;
 
-class G4VDeuteronBuilder
+class G4VDeuteronBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VDeuteronBuilder();
-  virtual ~G4VDeuteronBuilder();
+  G4VDeuteronBuilder() = default;
+  virtual ~G4VDeuteronBuilder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4DeuteronInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compilation warning
 };
 
 #endif

source/physics_lists/builders/include/G4VHe3Builder.hh

@@ -29,21 +29,27 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified:
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4VHe3Builder_h
 #define G4VHe3Builder_h
 
+#include "G4PhysicsBuilderInterface.hh"
+
 class G4He3InelasticProcess;
 class G4HadronElasticProcess;
 
-class G4VHe3Builder
+class G4VHe3Builder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VHe3Builder();
-  virtual ~G4VHe3Builder();
+  G4VHe3Builder() = default;
+  virtual ~G4VHe3Builder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4He3InelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 
 #endif

source/physics_lists/builders/include/G4VKaonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4VKaonBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4VKaonBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,27 +33,30 @@
 //  devired from G4VPiKBuilder
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4VKaonBuilder_h
 #define G4VKaonBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "G4HadronElasticProcess.hh"
 #include "G4KaonPlusInelasticProcess.hh"
 #include "G4KaonMinusInelasticProcess.hh"
 #include "G4KaonZeroLInelasticProcess.hh"
 #include "G4KaonZeroSInelasticProcess.hh"
 
-class G4VKaonBuilder
+class G4VKaonBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VKaonBuilder();
-  virtual ~G4VKaonBuilder();
+  G4VKaonBuilder() = default;
+  virtual ~G4VKaonBuilder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4KaonPlusInelasticProcess * aP) = 0;
   virtual void Build(G4KaonMinusInelasticProcess * aP) = 0;
   virtual void Build(G4KaonZeroLInelasticProcess * aP) = 0;
   virtual void Build(G4KaonZeroSInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 #endif

source/physics_lists/builders/include/G4VNeutronBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4VNeutronBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4VNeutronBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,26 +34,31 @@
 // Modified:
 // 21.11.2005 G.Folger: don't  keep processes as data members, but new these
 // 30.03.2009 V.Ivanchenko move constructor and destructor to source
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4VNeutronBuilder_h
 #define G4VNeutronBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
+
 class G4HadronElasticProcess;
 class G4HadronFissionProcess;
 class G4HadronCaptureProcess;
 class G4NeutronInelasticProcess;
 
-class G4VNeutronBuilder
+class G4VNeutronBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VNeutronBuilder();
-  virtual ~G4VNeutronBuilder();
+  G4VNeutronBuilder() = default;
+  virtual ~G4VNeutronBuilder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4HadronFissionProcess * aP) = 0;
   virtual void Build(G4HadronCaptureProcess * aP) = 0;
   virtual void Build(G4NeutronInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
+
 };
 // 2002 by J.P. Wellisch
 

source/physics_lists/builders/include/G4VPiKBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4VPiKBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4VPiKBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,12 +34,14 @@
 // Modified:
 // 16.11.2005 G.Folger: don't  keep processes as data members, but new these
 // 30.03.2009 V.Ivanchenko move constructor and destructor to source
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4VPiKBuilder_h
 #define G4VPiKBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "G4HadronElasticProcess.hh"
 #include "G4PionPlusInelasticProcess.hh"
 #include "G4PionMinusInelasticProcess.hh"
@@ -48,11 +50,11 @@
 #include "G4KaonZeroLInelasticProcess.hh"
 #include "G4KaonZeroSInelasticProcess.hh"
 
-class G4VPiKBuilder
+class G4VPiKBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VPiKBuilder();
-  virtual ~G4VPiKBuilder();
+  G4VPiKBuilder() = default;
+  virtual ~G4VPiKBuilder() {}
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4PionPlusInelasticProcess * aP) = 0;
   virtual void Build(G4PionMinusInelasticProcess * aP) = 0;
@@ -60,6 +62,7 @@ public:
   virtual void Build(G4KaonMinusInelasticProcess * aP) = 0;
   virtual void Build(G4KaonZeroLInelasticProcess * aP) = 0;
   virtual void Build(G4KaonZeroSInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning;
 };
 // 2002 by J.P. Wellisch
 

source/physics_lists/builders/include/G4VPionBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4VPionBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4VPionBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,23 +33,26 @@
 //  devired from G4VPiKBuilder
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
 #ifndef G4VPionBuilder_h
 #define G4VPionBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
 #include "G4HadronElasticProcess.hh"
 #include "G4PionPlusInelasticProcess.hh"
 #include "G4PionMinusInelasticProcess.hh"
 
-class G4VPionBuilder
+class G4VPionBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VPionBuilder();
-  virtual ~G4VPionBuilder();
+  G4VPionBuilder() = default;
+  virtual ~G4VPionBuilder() {} 
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4PionPlusInelasticProcess * aP) = 0;
   virtual void Build(G4PionMinusInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 #endif

source/physics_lists/builders/include/G4VProtonBuilder.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4VProtonBuilder.hh 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4VProtonBuilder.hh 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,22 +34,25 @@
 // Modified:
 // 21.11.2005 G.Folger: don't  keep processes as data members, but new these
 // 30.03.2009 V.Ivanchenko move constructor and destructor to source
-//
+// 12.04.2017 A.Dotti move to new design with base class
 //----------------------------------------------------------------------------
 //
 #ifndef G4VProtonBuilder_h
 #define G4VProtonBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
+
 class G4ProtonInelasticProcess;
 class G4HadronElasticProcess;
 
-class G4VProtonBuilder
+class G4VProtonBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VProtonBuilder();
-  virtual ~G4VProtonBuilder();
+  G4VProtonBuilder() = default;
+  virtual ~G4VProtonBuilder() {}
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4ProtonInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 // 2002 by J.P. Wellisch
 

source/physics_lists/builders/include/G4VTritonBuilder.hh

@@ -29,21 +29,27 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
 #ifndef G4VTritonBuilder_h
 #define G4VTritonBuilder_h
 
+#include "G4PhysicsBuilderInterface.hh"
+
 class G4TritonInelasticProcess;
 class G4HadronElasticProcess;
 
-class G4VTritonBuilder
+class G4VTritonBuilder : public G4PhysicsBuilderInterface
 {
 public:
-  G4VTritonBuilder();
-  virtual ~G4VTritonBuilder();
+  G4VTritonBuilder() = default;
+  virtual ~G4VTritonBuilder() {}
   virtual void Build(G4HadronElasticProcess * aP) = 0;
   virtual void Build(G4TritonInelasticProcess * aP) = 0;
+  using G4PhysicsBuilderInterface::Build; //Prevent compiler warning
 };
 
 #endif

source/physics_lists/builders/sources.cmake

@@ -11,7 +11,7 @@
 #
 # Generated on : 24/9/2010
 #
-# $Id: sources.cmake 94498 2015-11-19 15:46:58Z gcosmo $
+# $Id: sources.cmake 103801 2017-04-27 13:59:03Z gcosmo $
 #
 #------------------------------------------------------------------------------
 
@@ -155,7 +155,6 @@ GEANT4_DEFINE_MODULE(NAME G4phys_builders
         G4VPiKBuilder.hh
         G4VPionBuilder.hh
         G4VProtonBuilder.hh
-        TheoModelFactory.hh
         G4AlphaBuilder.hh
         G4AlphaPHPBuilder.hh
         G4BinaryAlphaBuilder.hh
@@ -222,13 +221,7 @@ GEANT4_DEFINE_MODULE(NAME G4phys_builders
         G4QGSPPionBuilder.cc
         G4QGSPKaonBuilder.cc
         G4QGSPProtonBuilder.cc
-        G4VAntiBarionBuilder.cc
         G4VHadronModelBuilder.cc
-        G4VKaonBuilder.cc
-        G4VNeutronBuilder.cc
-        G4VPiKBuilder.cc
-        G4VPionBuilder.cc
-        G4VProtonBuilder.cc
         G4AlphaBuilder.cc
         G4AlphaPHPBuilder.cc
         G4BinaryAlphaBuilder.cc
@@ -243,10 +236,6 @@ GEANT4_DEFINE_MODULE(NAME G4phys_builders
         G4ProtonPHPBuilder.cc
         G4TritonBuilder.cc
         G4TritonPHPBuilder.cc
-        G4VAlphaBuilder.cc
-        G4VDeuteronBuilder.cc
-        G4VHe3Builder.cc
-        G4VTritonBuilder.cc
     GRANULAR_DEPENDENCIES
         G4baryons
         G4bosons

source/physics_lists/builders/src/G4AlphaBuilder.cc

@@ -31,6 +31,7 @@
 // ClassName:   G4AlphaBuilder
 //
 // Author: 2013 P. Arce
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -58,7 +59,13 @@
    theAlphaInelastic=new G4AlphaInelasticProcess;
  }
 
- G4AlphaBuilder::
- ~G4AlphaBuilder() 
- {}
+ void G4AlphaBuilder::RegisterMe(G4PhysicsBuilderInterface* ab) {
+   auto bld = dynamic_cast<G4VAlphaBuilder*>(ab);
+   if ( bld != nullptr ) {
+       theModelCollections.push_back(bld);
+   } else {
+       G4PhysicsBuilderInterface::RegisterMe(ab);
+   }
+ }
+
 

source/physics_lists/builders/src/G4AlphaPHPBuilder.cc

@@ -38,10 +38,6 @@ G4AlphaPHPBuilder()
   theParticlePHPModel = 0;
 }
 
-G4AlphaPHPBuilder::
-~G4AlphaPHPBuilder() 
-{}
-
 void G4AlphaPHPBuilder::
 Build(G4HadronElasticProcess *)
 {

source/physics_lists/builders/src/G4AntiBarionBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4AntiBarionBuilder.cc 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4AntiBarionBuilder.cc 103801 2017-04-27 13:59:03Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -32,6 +32,7 @@
 // Author: 2011 J. Apostolakis
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -51,17 +52,6 @@ G4AntiBarionBuilder(): wasActivated(false)
   theAntiAlphaInelastic=new G4AntiAlphaInelasticProcess;
 }
 
-G4AntiBarionBuilder::
-~G4AntiBarionBuilder(){
-  /*
-  delete theAntiProtonInelastic;
-  delete theAntiNeutronInelastic;
-  delete theAntiDeuteronInelastic;
-  delete theAntiTritonInelastic;
-  delete theAntiHe3Inelastic;
-  delete theAntiAlphaInelastic;
-  */
-}
 
 void G4AntiBarionBuilder::
 Build()
@@ -98,3 +88,12 @@ Build()
   theProcMan->AddDiscreteProcess(theAntiAlphaInelastic);
 }
 
+void G4AntiBarionBuilder::RegisterMe(G4PhysicsBuilderInterface* aB ) {
+  auto bld = dynamic_cast<G4VAntiBarionBuilder*>(aB);
+  if ( bld != nullptr ) {
+      theModelCollections.push_back(bld);
+  } else {
+      G4PhysicsBuilderInterface::RegisterMe(aB);
+  }
+
+}

source/physics_lists/builders/src/G4BertiniKaonBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniKaonBuilder.cc 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4BertiniKaonBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -62,15 +62,6 @@ G4BertiniKaonBuilder()
    theModel->SetMaxEnergy(theMax); 
  }
 
-G4BertiniKaonBuilder::~G4BertiniKaonBuilder() 
-{
-  /*
-   delete ChipsKaonMinus;
-   delete ChipsKaonPlus;
-   delete ChipsKaonZero;
-  */
-}
-
 void G4BertiniKaonBuilder::
 Build(G4KaonPlusInelasticProcess * aP)
  {
@@ -107,7 +98,3 @@ Build(G4KaonZeroSInelasticProcess * aP)
    aP->AddDataSet(ChipsKaonZero);
  }
 
-void G4BertiniKaonBuilder::
-Build(G4HadronElasticProcess * ) {}
-
-         

source/physics_lists/builders/src/G4BertiniNeutronBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniNeutronBuilder.cc 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BertiniNeutronBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -58,24 +59,5 @@ Build(G4NeutronInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-G4BertiniNeutronBuilder::
-~G4BertiniNeutronBuilder() 
-{
-}
-
-void G4BertiniNeutronBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
-void G4BertiniNeutronBuilder::
-Build(G4HadronFissionProcess * )
-{
-}
-
-void G4BertiniNeutronBuilder::
-Build(G4HadronCaptureProcess * )
-{
-}
 
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BertiniPiKBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniPiKBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4BertiniPiKBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -54,10 +55,6 @@ G4BertiniPiKBuilder()
    theModel->SetMaxEnergy(theMax); 
  }
 
-G4BertiniPiKBuilder::~G4BertiniPiKBuilder() 
-{
-}
-
 void G4BertiniPiKBuilder::
 Build(G4PionPlusInelasticProcess * aP)
  {
@@ -74,9 +71,6 @@ Build(G4PionMinusInelasticProcess * aP)
    theModel->SetMaxEnergy(theMax);
  }
 
-void G4BertiniPiKBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4BertiniPiKBuilder::
 Build(G4KaonPlusInelasticProcess * aP)
  {

source/physics_lists/builders/src/G4BertiniPionBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniPionBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4BertiniPionBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -34,6 +34,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -55,10 +56,6 @@ G4BertiniPionBuilder()
    theModel->SetMaxEnergy(theMax); 
  }
 
-G4BertiniPionBuilder::~G4BertiniPionBuilder() 
-{
-}
-
 void G4BertiniPionBuilder::
 Build(G4PionPlusInelasticProcess * aP)
  {
@@ -75,7 +72,5 @@ Build(G4PionMinusInelasticProcess * aP)
    theModel->SetMaxEnergy(theMax);
  }
 
-void G4BertiniPionBuilder::
-Build(G4HadronElasticProcess * ) {}
 
          

source/physics_lists/builders/src/G4BertiniProtonBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BertiniProtonBuilder.cc 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BertiniProtonBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -50,16 +51,6 @@ G4BertiniProtonBuilder()
   theModel = new G4CascadeInterface;
 }
 
-G4BertiniProtonBuilder::
-~G4BertiniProtonBuilder() 
-{
-}
-
-void G4BertiniProtonBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
 void G4BertiniProtonBuilder::
 Build(G4ProtonInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4BinaryAlphaBuilder.cc

@@ -33,6 +33,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -58,14 +59,4 @@ Build(G4AlphaInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-G4BinaryAlphaBuilder::
-~G4BinaryAlphaBuilder() 
-{
-}
-
-void G4BinaryAlphaBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BinaryDeuteronBuilder.cc

@@ -58,14 +58,4 @@ Build(G4DeuteronInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-G4BinaryDeuteronBuilder::
-~G4BinaryDeuteronBuilder() 
-{
-}
-
-void G4BinaryDeuteronBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BinaryHe3Builder.cc

@@ -58,14 +58,4 @@ Build(G4He3InelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-G4BinaryHe3Builder::
-~G4BinaryHe3Builder() 
-{
-}
-
-void G4BinaryHe3Builder::
-Build(G4HadronElasticProcess * )
-{
-}
-
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BinaryNeutronBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryNeutronBuilder.cc 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BinaryNeutronBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -32,7 +32,8 @@
 // Author: 2002 H.P. Wellisch
 //
 // Modified:
-// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -58,23 +59,4 @@ G4BinaryNeutronBuilder()
    aP->RegisterMe(theModel);
  }
 
-G4BinaryNeutronBuilder::~G4BinaryNeutronBuilder() 
-{
-}
-
-void G4BinaryNeutronBuilder::
-Build(G4HadronElasticProcess * )
- {
- }
-
-void G4BinaryNeutronBuilder::
-Build(G4HadronFissionProcess * )
- {
- }
-
-void G4BinaryNeutronBuilder::
-Build(G4HadronCaptureProcess * )
- {
- }
-
  // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BinaryPiKBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryPiKBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4BinaryPiKBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -33,6 +33,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -54,14 +55,6 @@ G4BinaryPiKBuilder()
   theModel->SetMaxEnergy(theMax); 
 }
 
-G4BinaryPiKBuilder::
-~G4BinaryPiKBuilder() 
-{
-}
-
-void G4BinaryPiKBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4BinaryPiKBuilder::
 Build(G4PionPlusInelasticProcess * aP)
 {
@@ -78,24 +71,4 @@ Build(G4PionMinusInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-void G4BinaryPiKBuilder::
-Build(G4KaonPlusInelasticProcess * )
-{
-}
-
-void G4BinaryPiKBuilder::
-Build(G4KaonMinusInelasticProcess * )
-{
-}
-
-void G4BinaryPiKBuilder::
-Build(G4KaonZeroLInelasticProcess * )
-{
-}
-
-void G4BinaryPiKBuilder::
-Build(G4KaonZeroSInelasticProcess * )
-{
-}
-
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BinaryPionBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryPionBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4BinaryPionBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -31,6 +31,8 @@
 //
 // Author: 2011 Gunter Folger
 //
+// Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -56,14 +58,6 @@ G4BinaryPionBuilder()
   theModel->SetMaxEnergy(theMax); 
 }
 
-G4BinaryPionBuilder::
-~G4BinaryPionBuilder()
-{
-}
-
-void G4BinaryPionBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4BinaryPionBuilder::
 Build(G4PionPlusInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4BinaryProtonBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4BinaryProtonBuilder.cc 66892 2013-01-17 10:57:59Z gunter $
+// $Id: G4BinaryProtonBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -58,14 +58,4 @@ Build(G4ProtonInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-G4BinaryProtonBuilder::
-~G4BinaryProtonBuilder() 
-{
-}
-
-void G4BinaryProtonBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4BinaryTritonBuilder.cc

@@ -33,6 +33,7 @@
 //
 // Modified:
 // 02.04.2009 V.Ivanchenko remove add cross section, string builderis reponsible 
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -58,14 +59,4 @@ Build(G4TritonInelasticProcess * aP)
   aP->RegisterMe(theModel);
 }
 
-G4BinaryTritonBuilder::
-~G4BinaryTritonBuilder() 
-{
-}
-
-void G4BinaryTritonBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
 // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4DeuteronBuilder.cc

@@ -32,6 +32,8 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
 //----------------------------------------------------------------------------
 //
  #include "G4DeuteronBuilder.hh"
@@ -58,7 +60,11 @@
    theDeuteronInelastic=new G4DeuteronInelasticProcess;
  }
 
- G4DeuteronBuilder::
- ~G4DeuteronBuilder() 
- {}
-
+ void G4DeuteronBuilder::RegisterMe(G4PhysicsBuilderInterface* aB) {
+   auto bld = dynamic_cast<G4VDeuteronBuilder*>(aB);
+   if ( bld != nullptr ) {
+       theModelCollections.push_back(bld);
+   } else {
+       G4PhysicsBuilderInterface::RegisterMe(aB);
+   }
+ }

source/physics_lists/builders/src/G4DeuteronPHPBuilder.cc

@@ -38,10 +38,6 @@ G4DeuteronPHPBuilder()
   theParticlePHPModel = 0;
 }
 
-G4DeuteronPHPBuilder::
-~G4DeuteronPHPBuilder() 
-{}
-
 void G4DeuteronPHPBuilder::
 Build(G4HadronElasticProcess *)
 {

source/physics_lists/builders/src/G4FTFBinaryNeutronBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryNeutronBuilder.cc 83616 2014-09-04 13:30:16Z gcosmo $
+// $Id: G4FTFBinaryNeutronBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -35,6 +35,7 @@
 // 18.11.2010 G.Folger, use G4CrossSectionPairGG for relativistic rise of cross
 //             section at high energies.
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -78,21 +79,6 @@ G4FTFBinaryNeutronBuilder::
   if ( theQuasiElastic ) delete theQuasiElastic;
 }
 
-void G4FTFBinaryNeutronBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
-void G4FTFBinaryNeutronBuilder::
-Build(G4HadronFissionProcess * )
-{
-}
-
-void G4FTFBinaryNeutronBuilder::
-Build(G4HadronCaptureProcess * )
-{
-}
-
 void G4FTFBinaryNeutronBuilder::
 Build(G4NeutronInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFBinaryPiKBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryPiKBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4FTFBinaryPiKBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -35,6 +35,7 @@
 // 18.11.2010 G.Folger, use G4CrossSectionPairGG for relativistic rise of cross
 //             section at high energies.
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -81,9 +82,6 @@ G4FTFBinaryPiKBuilder:: ~G4FTFBinaryPiKBuilder()
   if ( theQuasiElastic ) delete theQuasiElastic;
 }
 
-void G4FTFBinaryPiKBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4FTFBinaryPiKBuilder::
 Build(G4PionPlusInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFBinaryPionBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryPionBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4FTFBinaryPionBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -82,9 +82,6 @@ G4FTFBinaryPionBuilder:: ~G4FTFBinaryPionBuilder()
   if ( theQuasiElastic ) delete theQuasiElastic;
 }
 
-void G4FTFBinaryPionBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4FTFBinaryPionBuilder::
 Build(G4PionPlusInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFBinaryProtonBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFBinaryProtonBuilder.cc 83616 2014-09-04 13:30:16Z gcosmo $
+// $Id: G4FTFBinaryProtonBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -89,8 +89,3 @@ G4FTFBinaryProtonBuilder::
   //delete theModel;
   if ( theQuasiElastic ) delete theQuasiElastic;
 }
-
-void G4FTFBinaryProtonBuilder::
-Build(G4HadronElasticProcess * )
-{
-}

source/physics_lists/builders/src/G4FTFPAntiBarionBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPAntiBarionBuilder.cc 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFPAntiBarionBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 // GEANT4 tag $Name:  $
 //
 //---------------------------------------------------------------------------
@@ -86,9 +86,6 @@ G4FTFPAntiBarionBuilder::~G4FTFPAntiBarionBuilder()
   //delete theAntiNucleonData;
 }
 
-void G4FTFPAntiBarionBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4FTFPAntiBarionBuilder::
 Build(G4AntiProtonInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFPKaonBuilder.cc

@@ -28,6 +28,7 @@
 //---------------------------------------------------------------------------
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -73,9 +74,6 @@ G4FTFPKaonBuilder::~G4FTFPKaonBuilder()
   delete theLund;
 }
 
-void G4FTFPKaonBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4FTFPKaonBuilder::
 Build(G4KaonPlusInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFPNeutronBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPNeutronBuilder.cc 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFPNeutronBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -35,6 +35,7 @@
 // 18.11.2010 G.Folger, use G4CrossSectionPairGG for relativistic rise of cross
 //             section at high energies.
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -81,21 +82,6 @@ G4FTFPNeutronBuilder::
   delete theLund;
 }
 
-void G4FTFPNeutronBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
-void G4FTFPNeutronBuilder::
-Build(G4HadronFissionProcess * )
-{
-}
-
-void G4FTFPNeutronBuilder::
-Build(G4HadronCaptureProcess * )
-{
-}
-
 void G4FTFPNeutronBuilder::
 Build(G4NeutronInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFPPiKBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPPiKBuilder.cc 83699 2014-09-10 07:18:25Z gcosmo $
+// $Id: G4FTFPPiKBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -35,6 +35,7 @@
 // 18.11.2010 G.Folger, use G4CrossSectionPairGG for relativistic rise of cross
 //             section at high energies.
 // 30.03.2009 V.Ivanchenko create cross section by new
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -82,9 +83,6 @@ G4FTFPPiKBuilder::~G4FTFPPiKBuilder()
   delete theLund;
 }
 
-void G4FTFPPiKBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4FTFPPiKBuilder::
 Build(G4PionPlusInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFPPionBuilder.cc

@@ -28,6 +28,7 @@
 //---------------------------------------------------------------------------
 //
 // Modified:
+// 12.04.2017 A.Dotti move to new design with base class
 //
 //----------------------------------------------------------------------------
 //
@@ -75,9 +76,6 @@ G4FTFPPionBuilder::~G4FTFPPionBuilder()
   delete theLund;
 }
 
-void G4FTFPPionBuilder::
-Build(G4HadronElasticProcess * ) {}
-
 void G4FTFPPionBuilder::
 Build(G4PionPlusInelasticProcess * aP)
 {

source/physics_lists/builders/src/G4FTFPProtonBuilder.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: G4FTFPProtonBuilder.cc 81935 2014-06-06 15:41:42Z gcosmo $
+// $Id: G4FTFPProtonBuilder.cc 103555 2017-04-18 09:04:37Z gcosmo $
 //
 //---------------------------------------------------------------------------
 //
@@ -90,9 +90,4 @@ G4FTFPProtonBuilder::
   delete theLund;
 }
 
-void G4FTFPProtonBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
-
  // 2002 by J.P. Wellisch

source/physics_lists/builders/src/G4He3Builder.cc

@@ -32,6 +32,9 @@
 //
 // Author: 2013 P. Arce
 //
+// Modified
+// 12.04.2017 A.Dotti move to new design with base class
+//
 //----------------------------------------------------------------------------
 //
  #include "G4He3Builder.hh"
@@ -58,7 +61,11 @@
    theHe3Inelastic=new G4He3InelasticProcess;
  }
 
- G4He3Builder::
- ~G4He3Builder() 
- {}
-
+ void G4He3Builder::RegisterMe(G4PhysicsBuilderInterface* aB) {
+   auto bld = dynamic_cast<G4VHe3Builder*>(aB);
+   if ( bld != nullptr ) {
+       theModelCollections.push_back(bld);
+   } else {
+       G4PhysicsBuilderInterface::RegisterMe(aB);
+   }
+ }