Skip to content
Snippets Groups Projects
Commit bd30af4d authored by Dmitry Popov's avatar Dmitry Popov
Browse files

Fix warnings in G4MScInThinLayerTest

parent cd547b81
Branches
Tags
No related merge requests found
Showing
with 37 additions and 39 deletions
......@@ -6,7 +6,8 @@ gaudi_depends_on_subdirs(LHCbG4PhysLists)
find_package(CLHEP REQUIRED)
find_package(ROOT COMPONENTS Hist Gpad RIO)
include_directories(${CMAKE_INSTALL_PREFIX}/include)
include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
#include_directories(${CMAKE_INSTALL_PREFIX}/include)
link_directories(${CMAKE_INSTALL_PREFIX}/lib)
set(Geant4_LIBRARIES
......@@ -26,7 +27,4 @@ gaudi_add_executable(G4MScInThinLayerTest
add_dependencies(G4MScInThinLayerTest Geant4)
# Dirty fix to disable the pesky warning
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-suggest-override")
gaudi_install_scripts()
......@@ -49,10 +49,10 @@ class ActionInitialization : public G4VUserActionInitialization
ActionInitialization(DetectorConstruction*, RMSPlotter*);
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;
......
......@@ -70,8 +70,8 @@ class DetectorConstruction : public G4VUserDetectorConstruction
void SetMagField(G4double);
virtual G4VPhysicalVolume* Construct();
virtual void ConstructSDandField();
G4VPhysicalVolume* Construct() override;
void ConstructSDandField() override;
public:
......
......@@ -52,7 +52,7 @@ class DetectorMessenger: public G4UImessenger
DetectorMessenger(DetectorConstruction* );
~DetectorMessenger();
virtual void SetNewValue(G4UIcommand*, G4String);
void SetNewValue(G4UIcommand*, G4String) override;
private:
DetectorConstruction* fDetector;
......
......@@ -46,8 +46,8 @@ class EventAction : public G4UserEventAction
~EventAction();
public:
virtual void BeginOfEventAction(const G4Event*);
virtual void EndOfEventAction(const G4Event*);
void BeginOfEventAction(const G4Event*) override;
void EndOfEventAction(const G4Event*) override;
void AddEnergy (G4double edep) {fEnergyDeposit += edep;};
void AddTrakLenCharg(G4double length) {fTrakLenCharged += length;};
......
......@@ -47,12 +47,12 @@ public:
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......
......
......@@ -47,12 +47,12 @@ public:
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......
......
......@@ -48,11 +48,11 @@ public:
PhysicsList();
~PhysicsList();
virtual void ConstructParticle();
void ConstructParticle() override;
void AddPhysicsList(const G4String& name);
virtual void ConstructProcess();
void ConstructProcess() override;
void AddDecay();
void AddStepMax();
......
......@@ -51,7 +51,7 @@ public:
PhysicsListMessenger(PhysicsList* );
~PhysicsListMessenger();
virtual void SetNewValue(G4UIcommand*, G4String);
void SetNewValue(G4UIcommand*, G4String) override;
private:
......
......@@ -53,7 +53,7 @@ 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:
......
......@@ -50,7 +50,7 @@ class PrimaryGeneratorMessenger: public G4UImessenger
PrimaryGeneratorMessenger(PrimaryGeneratorAction*);
~PrimaryGeneratorMessenger();
virtual void SetNewValue(G4UIcommand*, G4String);
void SetNewValue(G4UIcommand*, G4String) override;
private:
PrimaryGeneratorAction* fAction;
......
......@@ -97,7 +97,7 @@ class Run : public G4Run
G4double ComputeMscHighland();
virtual void Merge(const G4Run*);
void Merge(const G4Run*) override;
void EndOfRun(RMSPlotter* rmsplotter);
......
......@@ -57,9 +57,9 @@ public:
RunAction(DetectorConstruction* det, PrimaryGeneratorAction* prim = 0, RMSPlotter* rmsplotter = 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;
private:
DetectorConstruction* fDetector;
......
......@@ -50,7 +50,7 @@ class StackingAction : public G4UserStackingAction
void SetKillStatus(G4int value) { fKillSecondary = value;};
virtual G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track*);
G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track*) override;
private:
EventAction* fEventAction;
......
......@@ -49,7 +49,7 @@ class StackingMessenger: public G4UImessenger
StackingMessenger(StackingAction*);
~StackingMessenger();
virtual void SetNewValue(G4UIcommand*, G4String);
void SetNewValue(G4UIcommand*, G4String) override;
private:
StackingAction* fStackAction;
......
......@@ -50,17 +50,17 @@ class StepMax : public G4VDiscreteProcess
StepMax(const G4String& processName ="UserStepMax");
~StepMax();
virtual G4bool IsApplicable(const G4ParticleDefinition&);
G4bool IsApplicable(const G4ParticleDefinition&) override;
void SetMaxStep(G4double);
G4double GetMaxStep() {return fMaxChargedStep;};
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
{return 0.;}; // it is not needed here !
private:
......
......@@ -48,7 +48,7 @@ class StepMaxMessenger: public G4UImessenger
StepMaxMessenger(StepMax*);
~StepMaxMessenger();
virtual void SetNewValue(G4UIcommand*, G4String);
void SetNewValue(G4UIcommand*, G4String) override;
private:
StepMax* fStepMax;
......
......@@ -49,7 +49,7 @@ class SteppingAction : public G4UserSteppingAction
SteppingAction(DetectorConstruction*,EventAction*);
~SteppingAction();
virtual void UserSteppingAction(const G4Step*);
void UserSteppingAction(const G4Step*) override;
private:
DetectorConstruction* fDetector;
......
......@@ -46,8 +46,8 @@ public:
SteppingVerbose();
~SteppingVerbose();
virtual void TrackingStarted();
virtual void StepInfo();
void TrackingStarted() override;
void StepInfo() override;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
......
......@@ -50,8 +50,8 @@ class TrackingAction : public G4UserTrackingAction {
TrackingAction(DetectorConstruction*, EventAction*, RMSPlotter*);
~TrackingAction() {};
virtual void PreUserTrackingAction(const G4Track*);
virtual void PostUserTrackingAction(const G4Track*);
void PreUserTrackingAction(const G4Track*) override;
void PostUserTrackingAction(const G4Track*) override;
private:
DetectorConstruction* fDetector;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment