diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/ActionInitialization.hh b/LHCbG4Tests/G4SamplingCaloTest/include/ActionInitialization.hh
index 6807b1ca629a7c5de14f76c96f9d48d6de7b1d6d..e7c018f759b330224fc0f5054f9879557f6cbf75 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/ActionInitialization.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/ActionInitialization.hh
@@ -45,10 +45,10 @@ class ActionInitialization : public G4VUserActionInitialization
ActionInitialization(DetectorConstruction*);
virtual ~ActionInitialization();
- virtual void BuildForMaster() const;
- virtual void Build() const;
+ void BuildForMaster() const override;
+ void Build() const override;
- virtual G4VSteppingVerbose* InitializeSteppingVerbose() const;
+ G4VSteppingVerbose* InitializeSteppingVerbose() const override;
private:
DetectorConstruction* fDetector;
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/DetectorConstruction.hh b/LHCbG4Tests/G4SamplingCaloTest/include/DetectorConstruction.hh
index d5239e51e2948276234f2053cf2e3c06ff6507fe..ff889f1317ca5fc8edc44bcd298ae922bf3e0d54 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/DetectorConstruction.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/DetectorConstruction.hh
@@ -67,8 +67,8 @@ public:
void SetCalorSizeYZ (G4double);
void SetNbOfLayers (G4int);
- virtual G4VPhysicalVolume* Construct();
- virtual void ConstructSDandField();
+ G4VPhysicalVolume* Construct() override;
+ void ConstructSDandField() override;
public:
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/DetectorMessenger.hh b/LHCbG4Tests/G4SamplingCaloTest/include/DetectorMessenger.hh
index 60ec8d02ee3f369e50bd1b67bc842a5744e080e9..eaedd43d426ef60ef7f66e7fc7b457b114a4a568 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/DetectorMessenger.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/DetectorMessenger.hh
@@ -52,7 +52,7 @@ class DetectorMessenger: public G4UImessenger
DetectorMessenger(DetectorConstruction* );
~DetectorMessenger();
- virtual void SetNewValue(G4UIcommand*, G4String);
+ void SetNewValue(G4UIcommand*, G4String) override;
private:
DetectorConstruction* fDetector;
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/EventAction.hh b/LHCbG4Tests/G4SamplingCaloTest/include/EventAction.hh
index f2e98ac10136c7c6d6b4032a59f03eb69cadda12..bfd899b6f10a428ed37a67b5e28f23c534e01201 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/EventAction.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/EventAction.hh
@@ -46,8 +46,8 @@ class EventAction : public G4UserEventAction
EventAction(DetectorConstruction*);
~EventAction();
- virtual void BeginOfEventAction(const G4Event*);
- virtual void EndOfEventAction(const G4Event*);
+ void BeginOfEventAction(const G4Event*) override;
+ void EndOfEventAction(const G4Event*) override;
void SumEnergy(G4int k, G4double de, G4double dl)
{fEnergyDeposit[k] += de; fTrackLengthCh[k] += dl;};
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/PhysListEmStandard.hh b/LHCbG4Tests/G4SamplingCaloTest/include/PhysListEmStandard.hh
index 1ee366b0c009a0fff7c7f17566305c347de046f2..5832458a69b5e728fc320d809949db21f45af188 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/PhysListEmStandard.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/PhysListEmStandard.hh
@@ -47,12 +47,12 @@ class PhysListEmStandard : public G4VPhysicsConstructor
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......
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsList.hh b/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsList.hh
index cf5eef880ec6e8e12fa3c6728320a656a214be8e..2a6ff2c7eca770c5dc433e18fcc229a74de9ac5c 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsList.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsList.hh
@@ -50,8 +50,8 @@ public:
PhysicsList();
~PhysicsList();
- virtual void ConstructParticle();
- virtual void ConstructProcess();
+ void ConstructParticle() override;
+ void ConstructProcess() override;
void AddPhysicsList(const G4String& name);
void AddDecay();
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsListMessenger.hh b/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsListMessenger.hh
index 84684e4fb008c3ee5d206a5deb26aad3ac67de92..ca9e8a1ed970af75526ad2339451ad848e91329b 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsListMessenger.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/PhysicsListMessenger.hh
@@ -51,7 +51,7 @@ class PhysicsListMessenger: public G4UImessenger
PhysicsListMessenger(PhysicsList* );
~PhysicsListMessenger();
- virtual void SetNewValue(G4UIcommand*, G4String);
+ void SetNewValue(G4UIcommand*, G4String) override;
private:
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorAction.hh b/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorAction.hh
index 33780e3586423a7484dbe850730f8ce865b5fc37..b5c0a12e6f979086ec2172b2b5bdeced421529e4 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorAction.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorAction.hh
@@ -53,17 +53,16 @@ class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
public:
void SetDefaultKinematic();
void SetRndmBeam(G4double val) { fRndmBeam = val;}
- virtual
- void GeneratePrimaries(G4Event*);
-
+ void GeneratePrimaries(G4Event*) override;
+
G4ParticleGun* GetParticleGun() {return fParticleGun;};
-
+
private:
G4ParticleGun* fParticleGun;
- DetectorConstruction* fDetector;
+ DetectorConstruction* fDetector;
G4double fRndmBeam; //lateral random beam extension in fraction sizeYZ/2
- PrimaryGeneratorMessenger* fGunMessenger;
+ PrimaryGeneratorMessenger* fGunMessenger;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorMessenger.hh b/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorMessenger.hh
index 4b3f6be9fce067a9e94853cddecaf499880c8e13..07c6530a8c468896c392c270e9d884a59b5b05cf 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorMessenger.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/PrimaryGeneratorMessenger.hh
@@ -50,7 +50,7 @@ class PrimaryGeneratorMessenger: public G4UImessenger
PrimaryGeneratorMessenger(PrimaryGeneratorAction*);
~PrimaryGeneratorMessenger();
- virtual void SetNewValue(G4UIcommand*, G4String);
+ void SetNewValue(G4UIcommand*, G4String) override;
private:
PrimaryGeneratorAction* fAction;
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/Run.hh b/LHCbG4Tests/G4SamplingCaloTest/include/Run.hh
index eb9ffdc980e804a919b9c9db2b28d69355fee3e7..bd5beb5ae7a6d3dc8e14ba235b3ed503097f4310 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/Run.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/Run.hh
@@ -66,7 +66,7 @@ class Run : public G4Run
void SetEdepAndRMS(G4int, G4double, G4double, G4double);
void SetApplyLimit(G4bool);
- virtual void Merge(const G4Run*);
+ void Merge(const G4Run*) override;
void EndOfRun();
private:
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/RunAction.hh b/LHCbG4Tests/G4SamplingCaloTest/include/RunAction.hh
index 1c766ae6bc34886ce9028e64c5002d430b41b7d0..314ff6c8aed227a3d2d944708ad45210b8262223 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/RunAction.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/RunAction.hh
@@ -55,9 +55,9 @@ public:
RunAction(DetectorConstruction*, PrimaryGeneratorAction* prim=0);
~RunAction();
- virtual G4Run* GenerateRun();
- virtual void BeginOfRunAction(const G4Run*);
- virtual void EndOfRunAction(const G4Run*);
+ G4Run* GenerateRun() override;
+ void BeginOfRunAction(const G4Run*) override;
+ void EndOfRunAction(const G4Run*) override;
// Acceptance parameters
void SetEdepAndRMS(G4int, G4double, G4double, G4double);
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/StepMax.hh b/LHCbG4Tests/G4SamplingCaloTest/include/StepMax.hh
index 4bfc3585d774144511cf1f33e0bd8b5da6906b26..3895a68121f4e437768e21d5e8dd01010be0f49f 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/StepMax.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/StepMax.hh
@@ -52,20 +52,19 @@ public:
StepMax(const G4String& processName = "UserStepMax");
~StepMax();
- G4bool IsApplicable(const G4ParticleDefinition&);
+ G4bool IsApplicable(const G4ParticleDefinition&) override;
void SetStepMax(G4int, G4double);
G4double GetStepMax(G4int k) { return fStepMax[k];};
- G4double PostStepGetPhysicalInteractionLength( const G4Track& track,
- G4double previousStepSize,
- G4ForceCondition* condition);
+ G4double PostStepGetPhysicalInteractionLength(const G4Track& track,
+ G4double previousStepSize,
+ G4ForceCondition* condition) override;
- G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&);
+ G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&) override;
- G4double GetMeanFreePath(const G4Track&, G4double,G4ForceCondition*)
- {return DBL_MAX;};
+ G4double GetMeanFreePath(const G4Track&, G4double,G4ForceCondition*) override { return DBL_MAX; };
private:
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/StepMaxMessenger.hh b/LHCbG4Tests/G4SamplingCaloTest/include/StepMaxMessenger.hh
index 67d5cdb718ac6029627cf4e7b554a4ed90623155..8ad4466cf67e3ed04c84e22e5ece08ab0cf9bd3c 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/StepMaxMessenger.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/StepMaxMessenger.hh
@@ -49,7 +49,7 @@ class StepMaxMessenger: public G4UImessenger
StepMaxMessenger(StepMax*);
~StepMaxMessenger();
- void SetNewValue(G4UIcommand*, G4String);
+ void SetNewValue(G4UIcommand*, G4String) override;
private:
StepMax* fStepMax;
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/SteppingAction.hh b/LHCbG4Tests/G4SamplingCaloTest/include/SteppingAction.hh
index c7e5844a72ed321a7b2ee1714e2411ff2b8c095d..71baf418db6598cd4a56533c13d47224b4730762 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/SteppingAction.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/SteppingAction.hh
@@ -48,7 +48,7 @@ class SteppingAction : public G4UserSteppingAction
SteppingAction(DetectorConstruction*, EventAction*);
~SteppingAction();
- virtual void UserSteppingAction(const G4Step*);
+ void UserSteppingAction(const G4Step*) override;
G4double BirksAttenuation(const G4Step*);
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/SteppingVerbose.hh b/LHCbG4Tests/G4SamplingCaloTest/include/SteppingVerbose.hh
index 0c533b70ce909b262b4362e84f51bcdf089a71ae..31d3809eba0c50cbbfdc4f5df97214e2fde3758c 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/SteppingVerbose.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/SteppingVerbose.hh
@@ -46,8 +46,8 @@ public:
SteppingVerbose();
~SteppingVerbose();
- virtual void TrackingStarted();
- virtual void StepInfo();
+ void TrackingStarted() override;
+ void StepInfo() override;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/LHCbG4Tests/G4SamplingCaloTest/include/TrackingAction.hh b/LHCbG4Tests/G4SamplingCaloTest/include/TrackingAction.hh
index f140650f9679add56a6f0a1185b9570d4c1ba349..fefc6903a35a35cf05aaee3a314d57ae49c65fcc 100644
--- a/LHCbG4Tests/G4SamplingCaloTest/include/TrackingAction.hh
+++ b/LHCbG4Tests/G4SamplingCaloTest/include/TrackingAction.hh
@@ -47,8 +47,8 @@ class TrackingAction : public G4UserTrackingAction {
TrackingAction(DetectorConstruction*);
~TrackingAction() {};
- virtual void PreUserTrackingAction(const G4Track*);
- virtual void PostUserTrackingAction(const G4Track*);
+ void PreUserTrackingAction(const G4Track*) override;
+ void PostUserTrackingAction(const G4Track*) override;
private:
DetectorConstruction* fDetector;