diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorConstruction.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorConstruction.hh
index 6343cc72bb849d6c4543e8b60512d730916b3552..e89b2c9ab304bff0a82a6650ce2b5ac892097739 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorConstruction.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorConstruction.hh
@@ -48,50 +48,50 @@ class DetectorMessenger;
 class DetectorConstruction : public G4VUserDetectorConstruction
 {
   public:
-  
+
     DetectorConstruction(G4float);
    ~DetectorConstruction();
 
   public:
-  
-     virtual G4VPhysicalVolume* Construct();
-     
+
+     G4VPhysicalVolume* Construct() override;
+
      void SetBoxDepth        (G4double);
-     void SetSizeXY       (G4double);       
-     void SetMaterial    (const G4String&);            
+     void SetSizeXY       (G4double);
+     void SetMaterial    (const G4String&);
      void SetMagField    (G4double);
-     void SetMaxStepSize (G4double);     
+     void SetMaxStepSize (G4double);
 
      void UpdateGeometry();
-     
+
   public:
-  
+
      const
-     G4VPhysicalVolume* GetWorld()      {return fP_Box;};           
-                    
-     G4double           GetXYSize()       {return fBoxXY;};      
-     G4double           GetBoxDepth()       {return fBoxDepth;};      
+     G4VPhysicalVolume* GetWorld()      {return fP_Box;};
+
+     G4double           GetXYSize()       {return fBoxXY;};
+     G4double           GetBoxDepth()       {return fBoxDepth;};
      G4Material*        GetMaterial()   {return fMaterial;};
-     
+
      void               PrintParameters();
-                       
+
   private:
-  
+
      G4VPhysicalVolume*    fP_Box;
      G4LogicalVolume*      fL_Box;
-     
+
      G4double              fBoxDepth;
      G4double              fBoxXY;
-     G4Material*           fMaterial;     
+     G4Material*           fMaterial;
      G4UniformMagField*    fMagField;
      G4UserLimits*         fUserLimits;
-     
+
      DetectorMessenger* fDetectorMessenger;
 
   private:
-    
+
      void               DefineMaterials();
-     G4VPhysicalVolume* ConstructVolumes();     
+     G4VPhysicalVolume* ConstructVolumes();
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorMessenger.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorMessenger.hh
index 908686496b1489153abca9b909407f02bc9807f7..7bc1a6c4b976d4082f51f7a66af3d955ee22e73c 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorMessenger.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/DetectorMessenger.hh
@@ -48,22 +48,22 @@ class G4UIcmdWithoutParameter;
 class DetectorMessenger: public G4UImessenger
 {
   public:
-  
+
     DetectorMessenger(DetectorConstruction* );
    ~DetectorMessenger();
-    
-    virtual void SetNewValue(G4UIcommand*, G4String);
-    
+
+    void SetNewValue(G4UIcommand*, G4String) override;
+
   private:
-  
+
     DetectorConstruction*      fDetector;
-    
+
     G4UIdirectory*             fTestemDir;
-    G4UIdirectory*             fDetDir;    
+    G4UIdirectory*             fDetDir;
     G4UIcmdWithAString*        fMaterCmd;
     G4UIcmdWithADoubleAndUnit* fSizeCmd;
     G4UIcmdWithADoubleAndUnit* fMagFieldCmd;
-    G4UIcmdWithADoubleAndUnit* fMaxStepCmd;    
+    G4UIcmdWithADoubleAndUnit* fMaxStepCmd;
     G4UIcmdWithoutParameter*   fUpdateCmd;
 };
 
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsList.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsList.hh
index ff0c0ec1b2c921863e8e5797e045f4771b30ee65..7520d00207ee70ff2635602c0343df98a00e1864 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsList.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsList.hh
@@ -56,8 +56,8 @@ class PhysicsList: public G4VModularPhysicsList
     virtual ~PhysicsList();
 
     // Construct particles
-    virtual void ConstructParticle();
-    virtual void ConstructProcess();
+    void ConstructParticle() override;
+    void ConstructProcess() override;
 
     void AddPhysicsList(const G4String& name);
     void ConstructHighEnergy();
@@ -71,7 +71,7 @@ class PhysicsList: public G4VModularPhysicsList
     void SetAnnihiToHadronFac(G4double);
 
   private:
- 
+
     G4VPhysicsConstructor* fEmPhysicsList;
     G4VPhysicsConstructor* fDecayPhysicsList;
     G4String fEmName;
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsListMessenger.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsListMessenger.hh
index 8b866cb135b398c056dc4c24530f638e1d86fb53..473e0fbd589b27e6f88778b2fa23e51ab96282df 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsListMessenger.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PhysicsListMessenger.hh
@@ -48,21 +48,21 @@ class G4UIcmdWithAString;
 class PhysicsListMessenger: public G4UImessenger
 {
   public:
-  
+
     PhysicsListMessenger(PhysicsList*);
    ~PhysicsListMessenger();
-    
-    virtual void SetNewValue(G4UIcommand*, G4String);
-    
+
+    void SetNewValue(G4UIcommand*, G4String) override;
+
   private:
-  
+
     PhysicsList*        fPhysList;
-    
-    G4UIdirectory*      fPhysDir;    
+
+    G4UIdirectory*      fPhysDir;
     G4UIcmdWithADouble* fGammaToMuPairFacCmd;
     G4UIcmdWithADouble* fGammaToEPairFacCmd;
     G4UIcmdWithADouble* fAnnihiToMuPairFacCmd;
-    G4UIcmdWithADouble* fAnnihiToHadronFacCmd;    
+    G4UIcmdWithADouble* fAnnihiToHadronFacCmd;
     G4UIcmdWithAString* fListCmd;
 
 };
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorAction.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorAction.hh
index 3177e91266a16d1f99022eb5a45468605df2f0dd..45b3517a0b36112036fa32b232cc9d6dc19db575 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorAction.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorAction.hh
@@ -47,18 +47,18 @@ class PrimaryGeneratorMessenger;
 class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
 {
   public:
-    PrimaryGeneratorAction(DetectorConstruction*, G4double, G4int);    
+    PrimaryGeneratorAction(DetectorConstruction*, G4double, G4int);
    ~PrimaryGeneratorAction();
 
   public:
-    void SetRndmBeam(G4double val)  {fRndmBeam = val;}   
-    virtual void GeneratePrimaries(G4Event*);
+    void SetRndmBeam(G4double val)  {fRndmBeam = val;}
+    void GeneratePrimaries(G4Event*) override;
 
   private:
     G4ParticleGun*             fParticleGun;
     DetectorConstruction*      fDetector;
-    G4double                   fRndmBeam;       
-    PrimaryGeneratorMessenger* fGunMessenger;     
+    G4double                   fRndmBeam;
+    PrimaryGeneratorMessenger* fGunMessenger;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorMessenger.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorMessenger.hh
index 453752a3784cf1b75abbb09708d25db4be43baa4..0e08a95f28cd60f38bc9d2d1c00b5cb80c298f6c 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorMessenger.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/PrimaryGeneratorMessenger.hh
@@ -48,12 +48,12 @@ class PrimaryGeneratorMessenger: public G4UImessenger
   public:
     PrimaryGeneratorMessenger(PrimaryGeneratorAction*);
    ~PrimaryGeneratorMessenger();
-    
-    virtual void SetNewValue(G4UIcommand*, G4String);
-    
+
+    void SetNewValue(G4UIcommand*, G4String) override;
+
   private:
     PrimaryGeneratorAction*    fAction;
-    G4UIdirectory*             fGunDir;     
+    G4UIdirectory*             fGunDir;
     G4UIcmdWithADouble*        fRndmCmd;
 };
 
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/ProcessesCount.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/ProcessesCount.hh
index c9c58419557cf27ad5e88def4b7d1886a9d27922..bf1c90430068dfb24eee1f51431a52ff44a7f11c 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/ProcessesCount.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/ProcessesCount.hh
@@ -44,12 +44,12 @@ class OneProcessCount
 public:
     OneProcessCount(G4String name) {fName=name; fCounter=0;};
    ~OneProcessCount() {};
-   
+
 public:
     G4String  GetName()       {return fName;};
-    G4int     GetCounter()    {return fCounter;};        
+    G4int     GetCounter()    {return fCounter;};
     void      Count()         {fCounter++;};
-    
+
 private:
     G4String fName;            // process name
     G4int    fCounter;         // process counter
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/RunAction.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/RunAction.hh
index 95d3ffc31bd327e14a9d728fbb363eca50b70978..6d942a4ebded18dca99ed68b28dfcf8aa4c7ff6d 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/RunAction.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/RunAction.hh
@@ -55,10 +55,10 @@ class RunAction : public G4UserRunAction
    ~RunAction();
 
   public:
-    virtual void BeginOfRunAction(const G4Run*);
-    virtual void   EndOfRunAction(const G4Run*);
-    void     CountProcesses(G4String);
-    
+    void BeginOfRunAction(const G4Run*) override;
+    void EndOfRunAction(const G4Run*) override;
+    void CountProcesses(G4String);
+
   private:
     DetectorConstruction* fDetector;
     ProcessesCount*       fProcCounter;
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StackingAction.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StackingAction.hh
index 81a3f7a63245642dbca2d61ca6fe55faa59a58ed..b0b44d3cacf2edcb3fed209d68a458fe6f61eacb 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StackingAction.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StackingAction.hh
@@ -27,7 +27,7 @@
 /// \brief Definition of the StackingAction class
 //
 // $Id: StackingAction.hh 66241 2012-12-13 18:34:42Z gunter $
-// 
+//
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -48,8 +48,8 @@ class StackingAction : public G4UserStackingAction
     StackingAction();
    ~StackingAction();
 
-    virtual G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* );
-    
+    G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* ) override;
+
 };
 
 #endif
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMax.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMax.hh
index d3fe8168e0baaeeed127d1fa6888a0c30ff7b7b5..e4b0186e65fd9f37c96fd0b6116c6bdfe9ed4fb8 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMax.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMax.hh
@@ -54,17 +54,15 @@ public:
 
   inline G4double GetMaxStep() { return fMaxChargedStep; };
 
-  virtual G4bool IsApplicable(const G4ParticleDefinition&);
+  G4bool IsApplicable(const G4ParticleDefinition&) override;
 
-  virtual G4double 
-  PostStepGetPhysicalInteractionLength(const G4Track& track,
-                                       G4double previousStepSize,
-                                       G4ForceCondition* condition);
+  G4double PostStepGetPhysicalInteractionLength(const G4Track& track,
+                                                G4double previousStepSize,
+                                                G4ForceCondition* condition) override;
 
-  virtual G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&);
+  G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&) override;
 
-  virtual G4double 
-  GetMeanFreePath(const G4Track&, G4double, G4ForceCondition*);
+  G4double GetMeanFreePath(const G4Track&, G4double, G4ForceCondition*) override;
 
 private:
 
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMaxMessenger.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMaxMessenger.hh
index 4b392de42b67e81b4026a21ebbaa5f553e1f0c43..ed1efaab45111c19a1fe34671fd3943dc7fb13dc 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMaxMessenger.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/StepMaxMessenger.hh
@@ -48,9 +48,9 @@ public:
 
   StepMaxMessenger(StepMax*);
   ~StepMaxMessenger();
-    
-  virtual void SetNewValue(G4UIcommand*, G4String);
-    
+
+  void SetNewValue(G4UIcommand*, G4String) override;
+
 private:
   StepMax* fStepMax;
   G4UIcmdWithADoubleAndUnit* fStepMaxCmd;
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingAction.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingAction.hh
index 0f0c8f11e1f3c2f7acb0ba88a33f94e9d77f20d3..bc835afb8cfb0839d84cb29627f3f2d20481d16c 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingAction.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingAction.hh
@@ -47,8 +47,8 @@ public:
   SteppingAction(RunAction*);
  ~SteppingAction();
 
-  virtual void UserSteppingAction(const G4Step*);
-    
+  void UserSteppingAction(const G4Step*) override;
+
 private:
   RunAction* fRunAction;
   G4double   fMuonMass;
diff --git a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingVerbose.hh b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingVerbose.hh
index 07ef0a99fd46cb40eab203f2d3543c0fb09e71f1..280d0debd8c0ad029851831f3529c1ffc08b41a2 100644
--- a/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingVerbose.hh
+++ b/LHCbG4Tests/G4GammaToDiLeptonConversionTest/include/SteppingVerbose.hh
@@ -28,7 +28,7 @@
 //
 //
 // $Id: SteppingVerbose.hh 98272 2016-07-04 17:56:04Z gcosmo $
-// 
+//
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -41,13 +41,13 @@
 
 class SteppingVerbose : public G4SteppingVerbose {
 
-public:   
+public:
 
   SteppingVerbose();
  ~SteppingVerbose();
- 
-  virtual void TrackingStarted();
-  virtual void StepInfo();
+
+  void TrackingStarted() override;
+  void StepInfo() override;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......