Import Geant4 10.7.0.beta source tree

source/physics_lists/constructors/decay/include/G4DecayPhysics.hh

@@ -47,27 +47,22 @@
 
 class G4DecayPhysics : public G4VPhysicsConstructor
 {
-  public: 
-    G4DecayPhysics(G4int ver = 1);
-    G4DecayPhysics(const G4String& name, G4int ver = 1);
-    virtual ~G4DecayPhysics();
+public: 
+  G4DecayPhysics(G4int ver = 1);
+  G4DecayPhysics(const G4String& name, G4int ver = 1);
+  ~G4DecayPhysics() override;
 
-  public: 
     // 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();
-
-  virtual G4Decay* GetDecayProcess() { return fDecayProcess; }
+  void ConstructProcess() override;
 
 private:
-  static G4ThreadLocal G4Decay* fDecayProcess;
   G4int    verbose;
-  static G4ThreadLocal G4bool   wasActivated;
 };
 
 #endif

source/physics_lists/constructors/decay/include/G4RadioactiveDecayPhysics.hh

@@ -33,25 +33,21 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class G4RadioactiveDecayBase;
-
 class G4RadioactiveDecayPhysics : public G4VPhysicsConstructor
 {
 public: 
   G4RadioactiveDecayPhysics(G4int verbose =1);
-  G4RadioactiveDecayPhysics(const G4String& name);
-  virtual ~G4RadioactiveDecayPhysics();
+  G4RadioactiveDecayPhysics(const G4String& name, G4int verbose =1);
+  ~G4RadioactiveDecayPhysics() override;
 
-public: 
   // This method is dummy for physics
-  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:
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

source/physics_lists/constructors/decay/include/G4SpinDecayPhysics.hh

@@ -44,30 +44,22 @@
 
 class G4SpinDecayPhysics : public G4VPhysicsConstructor
 {
-  public:
+public:
 
-    G4SpinDecayPhysics();
-    G4SpinDecayPhysics(const G4String& name);
-    virtual ~G4SpinDecayPhysics();
-
-  public:
+  G4SpinDecayPhysics(G4int ver = 1);
+  G4SpinDecayPhysics(const G4String& name, G4int ver = 1);
+  ~G4SpinDecayPhysics() 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();
-    
-  private:
-
-    G4DecayWithSpin* decayWithSpin;
-    G4PionDecayMakeSpin* poldecay;
-
+  void ConstructProcess() override;
 };
 
 #endif

source/physics_lists/constructors/decay/include/G4UnknownDecayPhysics.hh

@@ -39,31 +39,24 @@
 #include "globals.hh"
 #include "G4VPhysicsConstructor.hh"
 
-#include "G4UnknownDecay.hh"
-
 class G4UnknownDecayPhysics : public G4VPhysicsConstructor
 {
-  public: 
-    G4UnknownDecayPhysics(G4int ver = 1);
-    G4UnknownDecayPhysics(const G4String& name, G4int ver = 1);
-    virtual ~G4UnknownDecayPhysics();
+public: 
+  G4UnknownDecayPhysics(G4int ver = 1);
+  G4UnknownDecayPhysics(const G4String& name, G4int ver = 1);
+  ~G4UnknownDecayPhysics() override;
 
-  public: 
     // 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();
-
-  virtual G4UnknownDecay* GetDecayProcess() { return fDecayProcess; }
+  void ConstructProcess() override;
 
 private:
-  static G4ThreadLocal G4UnknownDecay* fDecayProcess;
   G4int    verbose;
-  static G4ThreadLocal G4bool   wasActivated;
 };
 
 #endif