Import Geant4 10.7.0.beta source tree

source/physics_lists/constructors/ions/include/G4IonBinaryCascadePhysics.hh

@@ -41,22 +41,13 @@
 #include "globals.hh"
 #include "G4IonPhysics.hh"
 
-class G4HadronInelasticProcess;
-class G4HadronicInteraction;
-class G4VCrossSectionDataSet;
-class G4VComponentCrossSection;
-class G4FTFBuilder;
-class G4BinaryLightIonReaction;
-
 class G4IonBinaryCascadePhysics : public G4IonPhysics
 {
 public:
   G4IonBinaryCascadePhysics(G4int ver = 0);
   G4IonBinaryCascadePhysics(const G4String& name, G4int ver = 0);
-  virtual ~G4IonBinaryCascadePhysics();
-
+  ~G4IonBinaryCascadePhysics() override;
 };
 
-
 #endif
 

source/physics_lists/constructors/ions/include/G4IonINCLXXPhysics.hh

@@ -54,16 +54,16 @@ class G4IonINCLXXPhysics : public G4VPhysicsConstructor
 public:
   G4IonINCLXXPhysics(G4int ver = 0);
   G4IonINCLXXPhysics(const G4String& name, G4int ver = 0);
-  virtual ~G4IonINCLXXPhysics();
+  ~G4IonINCLXXPhysics() override;
 
   // This method will be invoked in the Construct() method.
   // each particle type will be instantiated
-  virtual void ConstructParticle();
+  void ConstructParticle() override;
 
   // This method will be invoked in the Construct() method.
   // each physics process will be instantiated and
   // registered to the process manager of each particle type
-  virtual void ConstructProcess();
+  void ConstructProcess() override;
 
 private:
 
@@ -73,13 +73,6 @@ private:
 		  G4HadronicInteraction*,
 		  G4VCrossSectionDataSet*);
 
-  static G4ThreadLocal G4INCLXXInterface* theINCLXXDeuteron;
-  static G4ThreadLocal G4INCLXXInterface* theINCLXXTriton;
-  static G4ThreadLocal G4INCLXXInterface* theINCLXXHe3;
-  static G4ThreadLocal G4INCLXXInterface* theINCLXXAlpha;
-  static G4ThreadLocal G4INCLXXInterface* theINCLXXIons;
-  static G4ThreadLocal G4FTFBuilder* theFTFPBuilder;
-
   G4double emaxINCLXX;
   G4double deltaE;
 

source/physics_lists/constructors/ions/include/G4IonPhysics.hh

@@ -50,8 +50,8 @@ class G4IonPhysics : public G4VPhysicsConstructor
 public:
 
   G4IonPhysics(G4int ver = 0);
-  G4IonPhysics(const G4String& nname);
-  virtual ~G4IonPhysics();
+  G4IonPhysics(const G4String& nname, G4int ver = 0);
+  ~G4IonPhysics() override;
 
   // This method will be invoked in the Construct() method.
   // each physics process will be instantiated and
@@ -65,14 +65,11 @@ private:
 			  G4HadronicInteraction*, G4HadronicInteraction*, 
 			  G4VCrossSectionDataSet*);
 
-  static G4ThreadLocal G4FTFBuilder* theBuilder;
-
 protected:
 
   G4int verbose;
 };
 
-
 #endif
 
 

source/physics_lists/constructors/ions/include/G4IonPhysicsPHP.hh

@@ -54,14 +54,14 @@ class G4IonPhysicsPHP : public G4VPhysicsConstructor {
   public:
 
     G4IonPhysicsPHP( G4int ver = 0 );
-    G4IonPhysicsPHP( const G4String& nname );
-    virtual ~G4IonPhysicsPHP();
+    G4IonPhysicsPHP( const G4String& nname, G4int ver = 0 );
+    ~G4IonPhysicsPHP() override;
 
     // This method will be invoked in the Construct() method.
     // each physics process will be instantiated and
     // registered to the process manager of each particle type
-    void ConstructParticle();
-    void ConstructProcess();
+    void ConstructParticle() override;
+    void ConstructProcess() override;
 
   private:
 
@@ -70,8 +70,6 @@ class G4IonPhysicsPHP : public G4VPhysicsConstructor {
                      G4HadronicInteraction*, G4HadronicInteraction*,
 		     G4VCrossSectionDataSet*);
 
-    static G4ThreadLocal G4FTFBuilder*             theBuilder;
-
     G4int  verbose;
 };
 

source/physics_lists/constructors/ions/include/G4IonPhysicsXS.hh

@@ -50,8 +50,8 @@ class G4IonPhysicsXS : public G4IonPhysics
 public:
 
   G4IonPhysicsXS(G4int ver = 0);
-  G4IonPhysicsXS(const G4String& nname);
-  virtual ~G4IonPhysicsXS();
+  G4IonPhysicsXS(const G4String& nname, G4int ver = 0);
+  ~G4IonPhysicsXS()  override;
 
 private:
 

source/physics_lists/constructors/ions/include/G4IonQMDPhysics.hh

@@ -44,11 +44,9 @@
 
 #include <vector>
 
-class G4HadronInelasticProcess;
 class G4HadronicInteraction;
 class G4BinaryLightIonReaction;
 class G4QMDReaction;
-class G4FTFBuilder;
 class G4VCrossSectionDataSet;
 
 class G4IonQMDPhysics : public G4VPhysicsConstructor
@@ -56,16 +54,16 @@ class G4IonQMDPhysics : public G4VPhysicsConstructor
 public:
   G4IonQMDPhysics(G4int verb = 0);
   G4IonQMDPhysics(const G4String& name, G4int ver = 0);
-  virtual ~G4IonQMDPhysics();
+  ~G4IonQMDPhysics() override;
 
   // This method will be invoked in the Construct() method.
   // each particle type will be instantiated
-  virtual void ConstructParticle();
+  void ConstructParticle() override;
 
   // This method will be invoked in the Construct() method.
   // each physics process will be instantiated and
   // registered to the process manager of each particle type
-  virtual void ConstructProcess();
+  void ConstructProcess() override;
 
 private:
 
@@ -76,8 +74,6 @@ private:
 		  G4HadronicInteraction*,
 		  G4VCrossSectionDataSet*);
 
-  static G4ThreadLocal G4FTFBuilder* theFTFPBuilder;
-
   G4double eminQMD;
   G4double emaxQMD;
   G4double overlap;