Import Geant4 11.1.0.beta source tree

examples/extended/electromagnetic/TestEm9/include/EventAction.hh

@@ -45,15 +45,17 @@ class EventAction : public G4UserEventAction
 public: 
 
   EventAction();
+  ~EventAction() override = default;
 
-  virtual ~EventAction();
+  void BeginOfEventAction(const G4Event*) override;
+  void EndOfEventAction(const G4Event*) override;
 
-  virtual void BeginOfEventAction(const G4Event*);
-  virtual void   EndOfEventAction(const G4Event*);
+  EventAction & operator=(const EventAction &right) = delete;
+  EventAction(const EventAction&) = delete;
 
 private:
 
-  G4int    fVerbose;
+  G4int fVerbose;
 };
 
 #endif

examples/extended/electromagnetic/TestEm9/include/HistoManager.hh

@@ -107,7 +107,7 @@ public: // Without description
   // Acceptance parameters
   inline void SetBeamEnergy(G4double val) {fBeamEnergy = val;};
 
-  void SetEdepAndRMS(G4int, G4ThreeVector);
+  void SetEdepAndRMS(G4int, const G4ThreeVector&);
 
 private:
 
@@ -118,6 +118,8 @@ private:
   const G4ParticleDefinition* fElectron;
   const G4ParticleDefinition* fPositron;
 
+  Histo*    fHisto;
+
   G4int fNHisto;
   G4int fVerbose;
   G4int fEvt1;
@@ -129,14 +131,11 @@ private:
 
   G4double fTrackLength;
   G4double fStep;
-//  G4double fStepTarget;
   G4bool fTrackAbs;        // Track is in absorber
   G4int fEvt;
   G4int fElec;
   G4int fPosit;
   G4int fGam;
-//  G4int fGamph;
-//  G4int fGamTar;
   G4int fLowe;
   G4int fBinsE, fBinsEA, fBinsED;
 
@@ -158,11 +157,6 @@ private:
   G4double  fErmstr[6];
   G4int     fStat[6];
   G4int     fNmax;
-
-  Histo*    fHisto;
-  
-
-
 };
 
 #endif

examples/extended/electromagnetic/TestEm9/include/RunAction.hh

@@ -30,13 +30,6 @@
 #ifndef RunAction_h
 #define RunAction_h 1
 
-// -------------------------------------------------------------
-//
-//      GEANT4 
-//
-// 
-// -------------------------------------------------------------
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -48,19 +41,19 @@
 
 class RunAction : public G4UserRunAction
 {
-public: // Without description
+public:
 
   RunAction();
-  virtual ~RunAction();
+  ~RunAction() override = default;
 
-public: // With description
- 
-  virtual void BeginOfRunAction(const G4Run*);
+  void BeginOfRunAction(const G4Run*) override;
   // In this method histogramms are booked
 
-  virtual void EndOfRunAction(const G4Run*);
-  // In this method BookHisto method is called in which histogramms are filled
+  void EndOfRunAction(const G4Run*) override;
+  // In this method histogramms are stored
 
+  RunAction & operator=(const RunAction &right) = delete;
+  RunAction(const RunAction&) = delete;
 };
 
 #endif

examples/extended/electromagnetic/TestEm9/include/SteppingAction.hh

@@ -55,15 +55,15 @@ class SteppingAction : public G4UserSteppingAction
 {
 public:
   SteppingAction();
-  virtual ~SteppingAction();
+  ~SteppingAction() override = default;
 
-  virtual void UserSteppingAction(const G4Step*);
+  void UserSteppingAction(const G4Step*) override;
+
+  SteppingAction & operator=(const SteppingAction &right) = delete;
+  SteppingAction(const SteppingAction&) = delete;
 
 private:
 
-  SteppingAction & operator=(const SteppingAction &right);
-  SteppingAction(const SteppingAction&);
-
   HistoManager* fHisto;
 };
 

examples/extended/electromagnetic/TestEm9/include/TrackingAction.hh

@@ -34,8 +34,6 @@
 //
 // ClassName:   TrackingAction
 //
-// Description: Implementation file for control on MC truth
-//
 // Author:      V.Ivanchenko 13/03/01
 //
 // Modified:
@@ -57,18 +55,16 @@ class TrackingAction : public G4UserTrackingAction
 
 public:
   TrackingAction();
-  virtual ~TrackingAction();
+  ~TrackingAction() override = default;
 
-  virtual void PreUserTrackingAction(const G4Track*);
-  virtual void PostUserTrackingAction(const G4Track*);
+  void PreUserTrackingAction(const G4Track*) override;
+
+  TrackingAction & operator=(const TrackingAction &right) = delete;
+  TrackingAction(const TrackingAction&) = delete;
 
 private:
-
-  TrackingAction & operator=(const TrackingAction &right);
-  TrackingAction(const TrackingAction&);
-
+    
   HistoManager* fHisto;
-
 };
 
 #endif