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

Fix warnings in G4SamplingCaloTest

parent bd30af4d
Branches
Tags
No related merge requests found
Showing
with 35 additions and 37 deletions
...@@ -45,10 +45,10 @@ class ActionInitialization : public G4VUserActionInitialization ...@@ -45,10 +45,10 @@ class ActionInitialization : public G4VUserActionInitialization
ActionInitialization(DetectorConstruction*); ActionInitialization(DetectorConstruction*);
virtual ~ActionInitialization(); virtual ~ActionInitialization();
virtual void BuildForMaster() const; void BuildForMaster() const override;
virtual void Build() const; void Build() const override;
virtual G4VSteppingVerbose* InitializeSteppingVerbose() const; G4VSteppingVerbose* InitializeSteppingVerbose() const override;
private: private:
DetectorConstruction* fDetector; DetectorConstruction* fDetector;
......
...@@ -67,8 +67,8 @@ public: ...@@ -67,8 +67,8 @@ public:
void SetCalorSizeYZ (G4double); void SetCalorSizeYZ (G4double);
void SetNbOfLayers (G4int); void SetNbOfLayers (G4int);
virtual G4VPhysicalVolume* Construct(); G4VPhysicalVolume* Construct() override;
virtual void ConstructSDandField(); void ConstructSDandField() override;
public: public:
......
...@@ -52,7 +52,7 @@ class DetectorMessenger: public G4UImessenger ...@@ -52,7 +52,7 @@ class DetectorMessenger: public G4UImessenger
DetectorMessenger(DetectorConstruction* ); DetectorMessenger(DetectorConstruction* );
~DetectorMessenger(); ~DetectorMessenger();
virtual void SetNewValue(G4UIcommand*, G4String); void SetNewValue(G4UIcommand*, G4String) override;
private: private:
DetectorConstruction* fDetector; DetectorConstruction* fDetector;
......
...@@ -46,8 +46,8 @@ class EventAction : public G4UserEventAction ...@@ -46,8 +46,8 @@ class EventAction : public G4UserEventAction
EventAction(DetectorConstruction*); EventAction(DetectorConstruction*);
~EventAction(); ~EventAction();
virtual void BeginOfEventAction(const G4Event*); void BeginOfEventAction(const G4Event*) override;
virtual void EndOfEventAction(const G4Event*); void EndOfEventAction(const G4Event*) override;
void SumEnergy(G4int k, G4double de, G4double dl) void SumEnergy(G4int k, G4double de, G4double dl)
{fEnergyDeposit[k] += de; fTrackLengthCh[k] += dl;}; {fEnergyDeposit[k] += de; fTrackLengthCh[k] += dl;};
......
...@@ -47,12 +47,12 @@ class PhysListEmStandard : public G4VPhysicsConstructor ...@@ -47,12 +47,12 @@ class PhysListEmStandard : public G4VPhysicsConstructor
public: public:
// This method is dummy for physics // This method is dummy for physics
virtual void ConstructParticle() {}; void ConstructParticle() override {};
// This method will be invoked in the Construct() method. // This method will be invoked in the Construct() method.
// each physics process will be instantiated and // each physics process will be instantiated and
// registered to the process manager of each particle type // registered to the process manager of each particle type
virtual void ConstructProcess(); void ConstructProcess() override;
}; };
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
......
...@@ -50,8 +50,8 @@ public: ...@@ -50,8 +50,8 @@ public:
PhysicsList(); PhysicsList();
~PhysicsList(); ~PhysicsList();
virtual void ConstructParticle(); void ConstructParticle() override;
virtual void ConstructProcess(); void ConstructProcess() override;
void AddPhysicsList(const G4String& name); void AddPhysicsList(const G4String& name);
void AddDecay(); void AddDecay();
......
...@@ -51,7 +51,7 @@ class PhysicsListMessenger: public G4UImessenger ...@@ -51,7 +51,7 @@ class PhysicsListMessenger: public G4UImessenger
PhysicsListMessenger(PhysicsList* ); PhysicsListMessenger(PhysicsList* );
~PhysicsListMessenger(); ~PhysicsListMessenger();
virtual void SetNewValue(G4UIcommand*, G4String); void SetNewValue(G4UIcommand*, G4String) override;
private: private:
......
...@@ -53,17 +53,16 @@ class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction ...@@ -53,17 +53,16 @@ class PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
public: public:
void SetDefaultKinematic(); void SetDefaultKinematic();
void SetRndmBeam(G4double val) { fRndmBeam = val;} void SetRndmBeam(G4double val) { fRndmBeam = val;}
virtual void GeneratePrimaries(G4Event*) override;
void GeneratePrimaries(G4Event*);
G4ParticleGun* GetParticleGun() {return fParticleGun;}; G4ParticleGun* GetParticleGun() {return fParticleGun;};
private: private:
G4ParticleGun* fParticleGun; G4ParticleGun* fParticleGun;
DetectorConstruction* fDetector; DetectorConstruction* fDetector;
G4double fRndmBeam; //lateral random beam extension in fraction sizeYZ/2 G4double fRndmBeam; //lateral random beam extension in fraction sizeYZ/2
PrimaryGeneratorMessenger* fGunMessenger; PrimaryGeneratorMessenger* fGunMessenger;
}; };
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
......
...@@ -50,7 +50,7 @@ class PrimaryGeneratorMessenger: public G4UImessenger ...@@ -50,7 +50,7 @@ class PrimaryGeneratorMessenger: public G4UImessenger
PrimaryGeneratorMessenger(PrimaryGeneratorAction*); PrimaryGeneratorMessenger(PrimaryGeneratorAction*);
~PrimaryGeneratorMessenger(); ~PrimaryGeneratorMessenger();
virtual void SetNewValue(G4UIcommand*, G4String); void SetNewValue(G4UIcommand*, G4String) override;
private: private:
PrimaryGeneratorAction* fAction; PrimaryGeneratorAction* fAction;
......
...@@ -66,7 +66,7 @@ class Run : public G4Run ...@@ -66,7 +66,7 @@ class Run : public G4Run
void SetEdepAndRMS(G4int, G4double, G4double, G4double); void SetEdepAndRMS(G4int, G4double, G4double, G4double);
void SetApplyLimit(G4bool); void SetApplyLimit(G4bool);
virtual void Merge(const G4Run*); void Merge(const G4Run*) override;
void EndOfRun(); void EndOfRun();
private: private:
......
...@@ -55,9 +55,9 @@ public: ...@@ -55,9 +55,9 @@ public:
RunAction(DetectorConstruction*, PrimaryGeneratorAction* prim=0); RunAction(DetectorConstruction*, PrimaryGeneratorAction* prim=0);
~RunAction(); ~RunAction();
virtual G4Run* GenerateRun(); G4Run* GenerateRun() override;
virtual void BeginOfRunAction(const G4Run*); void BeginOfRunAction(const G4Run*) override;
virtual void EndOfRunAction(const G4Run*); void EndOfRunAction(const G4Run*) override;
// Acceptance parameters // Acceptance parameters
void SetEdepAndRMS(G4int, G4double, G4double, G4double); void SetEdepAndRMS(G4int, G4double, G4double, G4double);
......
...@@ -52,20 +52,19 @@ public: ...@@ -52,20 +52,19 @@ public:
StepMax(const G4String& processName = "UserStepMax"); StepMax(const G4String& processName = "UserStepMax");
~StepMax(); ~StepMax();
G4bool IsApplicable(const G4ParticleDefinition&); G4bool IsApplicable(const G4ParticleDefinition&) override;
void SetStepMax(G4int, G4double); void SetStepMax(G4int, G4double);
G4double GetStepMax(G4int k) { return fStepMax[k];}; G4double GetStepMax(G4int k) { return fStepMax[k];};
G4double PostStepGetPhysicalInteractionLength( const G4Track& track, G4double PostStepGetPhysicalInteractionLength(const G4Track& track,
G4double previousStepSize, G4double previousStepSize,
G4ForceCondition* condition); G4ForceCondition* condition) override;
G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&); G4VParticleChange* PostStepDoIt(const G4Track&, const G4Step&) override;
G4double GetMeanFreePath(const G4Track&, G4double,G4ForceCondition*) G4double GetMeanFreePath(const G4Track&, G4double,G4ForceCondition*) override { return DBL_MAX; };
{return DBL_MAX;};
private: private:
......
...@@ -49,7 +49,7 @@ class StepMaxMessenger: public G4UImessenger ...@@ -49,7 +49,7 @@ class StepMaxMessenger: public G4UImessenger
StepMaxMessenger(StepMax*); StepMaxMessenger(StepMax*);
~StepMaxMessenger(); ~StepMaxMessenger();
void SetNewValue(G4UIcommand*, G4String); void SetNewValue(G4UIcommand*, G4String) override;
private: private:
StepMax* fStepMax; StepMax* fStepMax;
......
...@@ -48,7 +48,7 @@ class SteppingAction : public G4UserSteppingAction ...@@ -48,7 +48,7 @@ class SteppingAction : public G4UserSteppingAction
SteppingAction(DetectorConstruction*, EventAction*); SteppingAction(DetectorConstruction*, EventAction*);
~SteppingAction(); ~SteppingAction();
virtual void UserSteppingAction(const G4Step*); void UserSteppingAction(const G4Step*) override;
G4double BirksAttenuation(const G4Step*); G4double BirksAttenuation(const G4Step*);
......
...@@ -46,8 +46,8 @@ public: ...@@ -46,8 +46,8 @@ public:
SteppingVerbose(); SteppingVerbose();
~SteppingVerbose(); ~SteppingVerbose();
virtual void TrackingStarted(); void TrackingStarted() override;
virtual void StepInfo(); void StepInfo() override;
}; };
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
......
...@@ -47,8 +47,8 @@ class TrackingAction : public G4UserTrackingAction { ...@@ -47,8 +47,8 @@ class TrackingAction : public G4UserTrackingAction {
TrackingAction(DetectorConstruction*); TrackingAction(DetectorConstruction*);
~TrackingAction() {}; ~TrackingAction() {};
virtual void PreUserTrackingAction(const G4Track*); void PreUserTrackingAction(const G4Track*) override;
virtual void PostUserTrackingAction(const G4Track*); void PostUserTrackingAction(const G4Track*) override;
private: private:
DetectorConstruction* fDetector; DetectorConstruction* fDetector;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment