Import Geant4 11.0.0.beta source tree

examples/extended/hadronic/NeutronSource/include/ActionInitialization.hh

@@ -33,7 +33,6 @@
 #include "G4VUserActionInitialization.hh"
 
 class DetectorConstruction;
-class G4VSteppingVerbose;
 
 /// Action initialization class.
 ///
@@ -46,8 +45,6 @@ class ActionInitialization : public G4VUserActionInitialization
 
     virtual void BuildForMaster() const;
     virtual void Build() const;
-    
-    virtual G4VSteppingVerbose* InitializeSteppingVerbose() const;
    
   private:
     DetectorConstruction* fDetector;

examples/extended/hadronic/NeutronSource/include/ElectromagneticPhysics.hh

@@ -42,16 +42,16 @@ class ElectromagneticPhysics : public G4VPhysicsConstructor
 {
   public: 
     ElectromagneticPhysics(const G4String& name = "standard");
-   ~ElectromagneticPhysics();
+   ~ElectromagneticPhysics() 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;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/hadronic/NeutronSource/include/GammaNuclearPhysics.hh

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file GammaNuclearPhysics.hh
+/// \file hadronic/Hadr03/include/GammaNuclearPhysics.hh
 /// \brief Definition of the GammaNuclearPhysics class
 //
 //
@@ -42,11 +42,11 @@ class GammaNuclearPhysics : public G4VPhysicsConstructor
 {
   public:
     GammaNuclearPhysics(const G4String& name="gamma");
-   ~GammaNuclearPhysics();
+   ~GammaNuclearPhysics() override;
 
   public:
-    virtual void ConstructParticle() { };
-    virtual void ConstructProcess();
+    void ConstructParticle() override { };
+    void ConstructProcess() override;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/extended/hadronic/NeutronSource/include/GammaNuclearPhysicsLEND.hh

@@ -23,32 +23,33 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-/// \file SteppingVerbose.hh
-/// \brief Definition of the SteppingVerbose class
+/// \file hadronic/Hadr03/include/GammaNuclearPhysicsLEND.hh
+/// \brief Definition of the GammaNuclearPhysics class
 //
 //
-// 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#ifndef SteppingVerbose_h
-#define SteppingVerbose_h 1
-
-#include "G4SteppingVerbose.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class SteppingVerbose : public G4SteppingVerbose {
+#ifndef GammaNuclearPhysicsLEND_h
+#define GammaNuclearPhysicsLEND_h 1
 
-public:   
+#include "globals.hh"
+#include "G4VPhysicsConstructor.hh"
 
-  SteppingVerbose();
- ~SteppingVerbose();
- 
-  virtual void TrackingStarted();
-  virtual void StepInfo();
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+class GammaNuclearPhysicsLEND : public G4VPhysicsConstructor
+{
+  public:
+    GammaNuclearPhysicsLEND(const G4String& name="gamma");
+   ~GammaNuclearPhysicsLEND() override;
+
+  public:
+    void ConstructParticle() override { };
+    void ConstructProcess() override;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 #endif
+

examples/extended/hadronic/NeutronSource/include/PhysicsList.hh

@@ -40,11 +40,11 @@ class PhysicsList: public G4VModularPhysicsList
 {
 public:
   PhysicsList();
- ~PhysicsList();
+ ~PhysicsList() override;
 
 public:
-  virtual void ConstructProcess();
-  virtual void SetCuts();
+  void ConstructProcess() override;
+  void SetCuts()override;
 
 private:
    G4VPhysicsConstructor* fHadronElastic;

examples/extended/hadronic/NeutronSource/include/Run.hh

@@ -52,24 +52,26 @@ class Run : public G4Run
   public:
     void SetPrimary(G4ParticleDefinition* particle, G4double energy);         
     void CountProcesses(const G4VProcess* process);
-    void ParticleCount(G4String, G4double); 
+    void ParticleCount(G4String, G4double, G4double); 
     void AddEdep (G4double edep);
     void AddEflow (G4double eflow);                   
     void ParticleFlux(G4String, G4double); 
                           
-    virtual void Merge(const G4Run*);
+    void Merge(const G4Run*) override;
     void EndOfRun();     
    
   private:
     struct ParticleData {
      ParticleData()
-       : fCount(0), fEmean(0.), fEmin(0.), fEmax(0.) {}
-     ParticleData(G4int count, G4double ekin, G4double emin, G4double emax)
-       : fCount(count), fEmean(ekin), fEmin(emin), fEmax(emax) {}
+       : fCount(0), fEmean(0.), fEmin(0.), fEmax(0.),fTmean(-1.) {}
+     ParticleData(G4int count, G4double ekin, G4double emin, G4double emax,
+                  G4double meanLife)
+       : fCount(count),fEmean(ekin),fEmin(emin),fEmax(emax),fTmean(meanLife) {}
      G4int     fCount;
      G4double  fEmean;
      G4double  fEmin;
      G4double  fEmax;
+     G4double  fTmean;
     };
      
   private: