diff --git a/Generators/Pythia8_i/Pythia8_i/Pythia8_i.h b/Generators/Pythia8_i/Pythia8_i/Pythia8_i.h index 20fc66407e7682dbf6d0347eef9a85e7bbe025c5..76be2e02c488cf1fc6644fda95deaf9102fc996a 100644 --- a/Generators/Pythia8_i/Pythia8_i/Pythia8_i.h +++ b/Generators/Pythia8_i/Pythia8_i/Pythia8_i.h @@ -85,7 +85,6 @@ protected: bool useRndmGenSvc() const { return m_useRndmGenSvc; } - // make these protected so that Pythia8B can access them std::unique_ptr<Pythia8::Pythia> m_pythia{}; HepMC::Pythia8ToHepMC m_pythiaToHepMC; UnsignedIntegerProperty m_maxFailures{this, "MaxFailures", 10}; diff --git a/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.cxx b/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.cxx index 53e94ec234d7bbe90bec937e609c4b0a6b92dd3f..c6b7ce422ce5a288b0223b56626b4f68e225123a 100644 --- a/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.cxx +++ b/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.cxx @@ -10,17 +10,7 @@ AthAlgTool(type, name, parent), m_nFailures(0){ declareProperty("MaxFailures", m_maxFailures=5); } -/* - StatusCode initialize(){ - - return StatusCode::SUCCESS; - } - - StatusCode finalize(){ - - return StatusCode::SUCCESS; - } - */ + StatusCode CheckForFinalPartons::ModifyPythiaEvent(Pythia8::Pythia &pythia) const { bool status = true; diff --git a/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.h b/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.h index 940d15a6a96494b6937780fbf8da560f9a54f726..c3b284834d136506363db6afe66364da9ac4fab5 100644 --- a/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.h +++ b/Generators/Pythia8_i/src/Pythia8Custom/CheckForFinalPartons.h @@ -16,7 +16,7 @@ class CheckForFinalPartons: public AthAlgTool, virtual public IPythia8Custom{ CheckForFinalPartons(const std::string &type, const std::string &name, const IInterface *parent); - StatusCode ModifyPythiaEvent(Pythia8::Pythia &pythia) const; + StatusCode ModifyPythiaEvent(Pythia8::Pythia &pythia) const override; private: diff --git a/Generators/Pythia8_i/src/Pythia8Custom/HllgamRepeatTimeShower.h b/Generators/Pythia8_i/src/Pythia8Custom/HllgamRepeatTimeShower.h index 98c012b2ed892f49f0336dee9d252df3a1851f13..29f1c04bef87f144820fe80e8427bf70d27d4962 100644 --- a/Generators/Pythia8_i/src/Pythia8Custom/HllgamRepeatTimeShower.h +++ b/Generators/Pythia8_i/src/Pythia8Custom/HllgamRepeatTimeShower.h @@ -24,16 +24,16 @@ class HllgamRepeatTimeShower: public AthAlgTool, virtual public IPythia8Custom { virtual ~HllgamRepeatTimeShower(){}; /** AlgTool initialize method */ - StatusCode initialize(); + StatusCode initialize() override; /** AlgTool finalize method */ - StatusCode finalize(); + StatusCode finalize() override; /** Update the pythia event*/ - StatusCode ModifyPythiaEvent(Pythia8::Pythia& pythia) const; + StatusCode ModifyPythiaEvent(Pythia8::Pythia& pythia) const override; /** Return how much the cross section is modified. * Should only be called once all events have been processed */ - virtual double CrossSectionScaleFactor() const; + virtual double CrossSectionScaleFactor() const override; private: diff --git a/Generators/Pythia8_i/src/Pythia8Custom/UserPhotonFlux.h b/Generators/Pythia8_i/src/Pythia8Custom/UserPhotonFlux.h index 26427a44b398cde74c538ed9f6bf603246931a93..3a186f8a4b3e576d4db8a4a0f145408b26990ada 100644 --- a/Generators/Pythia8_i/src/Pythia8Custom/UserPhotonFlux.h +++ b/Generators/Pythia8_i/src/Pythia8Custom/UserPhotonFlux.h @@ -87,18 +87,18 @@ class UserPhotonFlux: public AthAlgTool, virtual public IPythia8Custom { virtual ~UserPhotonFlux(){}; /** AlgTool initialize method */ - StatusCode initialize(); + StatusCode initialize() override; /** AlgTool finalize method */ - StatusCode finalize(); + StatusCode finalize() override; /** Update the pythia event Probably not used for this application */ - StatusCode ModifyPythiaEvent(Pythia8::Pythia& pythia) const; + StatusCode ModifyPythiaEvent(Pythia8::Pythia& pythia) const override; /** Return how much the cross section is modified. * Probably not used for this application */ - virtual double CrossSectionScaleFactor() const; + virtual double CrossSectionScaleFactor() const override; StatusCode InitializePythiaInfo(Pythia8::Pythia& ) const;