diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h index 0fc9f87a686ba..92da9223906d7 100644 --- a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h +++ b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.h @@ -21,16 +21,16 @@ class CaloTPGTranscoderULUT : public CaloTPGTranscoder { const std::string& decompressionFile=""); virtual ~CaloTPGTranscoderULUT(); virtual HcalTriggerPrimitiveSample hcalCompress(const HcalTrigTowerDetId& id, unsigned int sample, int fineGrain) const override; - virtual EcalTriggerPrimitiveSample ecalCompress(const EcalTrigTowerDetId& id, unsigned int sample, bool fineGrain) const; + virtual EcalTriggerPrimitiveSample ecalCompress(const EcalTrigTowerDetId& id, unsigned int sample, bool fineGrain) const override; virtual void rctEGammaUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc, const EcalTrigTowerDetId& eid, const EcalTriggerPrimitiveSample& ec, - unsigned int& et, bool& egVecto, bool& activity) const; + unsigned int& et, bool& egVecto, bool& activity) const override; virtual void rctJetUncompress(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc, const EcalTrigTowerDetId& eid, const EcalTriggerPrimitiveSample& ec, - unsigned int& et) const; - virtual double hcaletValue(const int& ieta, const int& iphi, const int& version, const int& compressedValue) const; - virtual double hcaletValue(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc) const; + unsigned int& et) const override; + virtual double hcaletValue(const int& ieta, const int& iphi, const int& version, const int& compressedValue) const override; + virtual double hcaletValue(const HcalTrigTowerDetId& hid, const HcalTriggerPrimitiveSample& hc) const override; virtual bool HTvalid(const int ieta, const int iphi, const int version) const; virtual const std::vector getCompressionLUT(const HcalTrigTowerDetId& id) const; virtual void setup(HcalLutMetadata const&, HcalTrigTowerGeometry const&, int, int); diff --git a/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h b/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h index ffa320309002b..df3d7fa4458ed 100644 --- a/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h +++ b/CalibCalorimetry/HcalTPGAlgos/interface/HcaluLUTTPGCoder.h @@ -38,10 +38,10 @@ class HcaluLUTTPGCoder : public HcalTPGCoder { virtual void adc2Linear(const HFDataFrame& df, IntegerCaloSamples& ics) const override; virtual void adc2Linear(const QIE10DataFrame& df, IntegerCaloSamples& ics) const override; virtual void adc2Linear(const QIE11DataFrame& df, IntegerCaloSamples& ics) const override; - virtual void compress(const IntegerCaloSamples& ics, const std::vector& featureBits, HcalTriggerPrimitiveDigi& tp) const; - virtual unsigned short adc2Linear(HcalQIESample sample,HcalDetId id) const; - virtual float getLUTPedestal(HcalDetId id) const; - virtual float getLUTGain(HcalDetId id) const; + virtual void compress(const IntegerCaloSamples& ics, const std::vector& featureBits, HcalTriggerPrimitiveDigi& tp) const override; + virtual unsigned short adc2Linear(HcalQIESample sample,HcalDetId id) const override; + virtual float getLUTPedestal(HcalDetId id) const override; + virtual float getLUTGain(HcalDetId id) const override; void update(const HcalDbService& conditions); void update(const char* filename, bool appendMSB = false); diff --git a/CalibFormats/SiPixelObjects/interface/PixelCalibBase.h b/CalibFormats/SiPixelObjects/interface/PixelCalibBase.h index 585df1b8ce1d2..2707e676b90da 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelCalibBase.h +++ b/CalibFormats/SiPixelObjects/interface/PixelCalibBase.h @@ -28,7 +28,7 @@ namespace pos{ PixelCalibBase(); virtual ~PixelCalibBase(); virtual std::string mode() const {return mode_;} - virtual void writeXMLHeader( pos::PixelConfigKey &key, + virtual void writeXMLHeader( pos::PixelConfigKey key, int version, std::string path, std::ofstream *out, diff --git a/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h b/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h index ffdd40750d810..f5d9ccfce046e 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h +++ b/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h @@ -156,7 +156,7 @@ namespace pos{ const std::set & moduleList() const {assert(rocAndModuleListsBuilt_); return modules_;} const std::set & channelList() const {assert( objectsDependingOnTheNameTranslationBuilt_ ); return channels_;} - std::string mode() const {return mode_;} + std::string mode() const override {return mode_;} bool singleROC() const {return singleROC_;} @@ -172,22 +172,22 @@ namespace pos{ friend std::ostream& pos::operator<<(std::ostream& s, const PixelCalibConfiguration& calib); - virtual void writeASCII(std::string dir="") const; - void writeXML( pos::PixelConfigKey key, int version, std::string path) const {;} + virtual void writeASCII(std::string dir="") const override; + void writeXML( pos::PixelConfigKey key, int version, std::string path) const override{;} virtual void writeXMLHeader( pos::PixelConfigKey key, int version, std::string path, std::ofstream *out, std::ofstream *out1 = NULL, std::ofstream *out2 = NULL - ) const ; + ) const override; virtual void writeXML( std::ofstream *out, std::ofstream *out1 = NULL , - std::ofstream *out2 = NULL ) const ; + std::ofstream *out2 = NULL ) const override; virtual void writeXMLTrailer( std::ofstream *out, std::ofstream *out1 = NULL, std::ofstream *out2 = NULL - ) const ; + ) const override; private: diff --git a/CalibFormats/SiPixelObjects/interface/PixelDelay25Calib.h b/CalibFormats/SiPixelObjects/interface/PixelDelay25Calib.h index 865cf149a1a97..288866c5681ab 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelDelay25Calib.h +++ b/CalibFormats/SiPixelObjects/interface/PixelDelay25Calib.h @@ -29,22 +29,22 @@ namespace pos{ PixelDelay25Calib(std::vector > &); ~PixelDelay25Calib(); - virtual void writeASCII(std::string dir="") const; - void writeXML( pos::PixelConfigKey key, int version, std::string path) const {;} + virtual void writeASCII(std::string dir="") const override; + void writeXML( pos::PixelConfigKey key, int version, std::string path) const override {;} virtual void writeXMLHeader( pos::PixelConfigKey key, int version, std::string path, std::ofstream *out, std::ofstream *out1 = NULL, std::ofstream *out2 = NULL - ) const ; + ) const override; virtual void writeXML( std::ofstream *out, std::ofstream *out1 = NULL , - std::ofstream *out2 = NULL ) const ; + std::ofstream *out2 = NULL ) const override; virtual void writeXMLTrailer( std::ofstream *out, std::ofstream *out1 = NULL, std::ofstream *out2 = NULL - ) const ; + ) const override; std::set& portcardList() {return portcardNames_;} bool allPortcards() {return allPortcards_;} diff --git a/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h b/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h index ae4bd798010b5..f44ef107b4312 100644 --- a/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h +++ b/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h @@ -30,10 +30,10 @@ class FakeTTrig : public edm::EDAnalyzer { virtual ~FakeTTrig(); // Operations - virtual void beginRun(const edm::Run& run, const edm::EventSetup& setup ); + virtual void beginRun(const edm::Run& run, const edm::EventSetup& setup ) override; virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup){} - virtual void endJob(); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup)override {} + virtual void endJob() override; // TOF computation double tofComputation(const DTSuperLayer* superlayer); diff --git a/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc b/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc index 3aabe41f750b2..931a606df258a 100644 --- a/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc @@ -70,8 +70,8 @@ class AnalyzerMinbias : public edm::EDAnalyzer { ~AnalyzerMinbias(); virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void beginJob() ; - virtual void endJob() ; + virtual void beginJob() override; + virtual void endJob() override; private: diff --git a/Calibration/HcalCalibAlgos/test/HcalIsoTrkAnalyzer.cc b/Calibration/HcalCalibAlgos/test/HcalIsoTrkAnalyzer.cc index 8121ad18cc85b..65fff8ee05cb4 100644 --- a/Calibration/HcalCalibAlgos/test/HcalIsoTrkAnalyzer.cc +++ b/Calibration/HcalCalibAlgos/test/HcalIsoTrkAnalyzer.cc @@ -80,7 +80,7 @@ class HcalIsoTrkAnalyzer : public edm::one::EDAnalyzer private: virtual void analyze(edm::Event const&, edm::EventSetup const&) override; - virtual void beginRun(edm::Run const&, edm::EventSetup const&) {} - virtual void endRun(edm::Run const&, edm::EventSetup const&) {} + virtual void beginRun(edm::Run const&, edm::EventSetup const&) override {} + virtual void endRun(edm::Run const&, edm::EventSetup const&) override {} // ----------member data --------------------------- std::string tagname_; diff --git a/CommonTools/TriggerUtils/interface/CandidateTriggerObjectProducer.h b/CommonTools/TriggerUtils/interface/CandidateTriggerObjectProducer.h index af73f31932cf4..96b39fce42cbf 100644 --- a/CommonTools/TriggerUtils/interface/CandidateTriggerObjectProducer.h +++ b/CommonTools/TriggerUtils/interface/CandidateTriggerObjectProducer.h @@ -28,9 +28,9 @@ class CandidateTriggerObjectProducer : public edm::EDProducer { private: virtual void beginRun(const edm::Run& iRun, edm::EventSetup const& iSetup) override; - virtual void beginJob() {} ; + virtual void beginJob() override {} ; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() {} ; + virtual void endJob() override {} ; /// module config parameters edm::InputTag triggerResultsTag_; diff --git a/CondTools/Hcal/interface/StreamOutFormatTarget.h b/CondTools/Hcal/interface/StreamOutFormatTarget.h index f82c426dded0d..b6f17bff79aea 100644 --- a/CondTools/Hcal/interface/StreamOutFormatTarget.h +++ b/CondTools/Hcal/interface/StreamOutFormatTarget.h @@ -43,7 +43,7 @@ class XMLPARSER_EXPORT StreamOutFormatTarget : public XMLFormatTarget { const XMLSize_t count, XMLFormatter* const formatter) override; - virtual void flush(); + virtual void flush() override; private: std::ostream* mStream; diff --git a/DPGAnalysis/Skims/interface/CSCSkim.h b/DPGAnalysis/Skims/interface/CSCSkim.h index 7236359c06da8..5919b04e79906 100644 --- a/DPGAnalysis/Skims/interface/CSCSkim.h +++ b/DPGAnalysis/Skims/interface/CSCSkim.h @@ -79,9 +79,9 @@ class CSCSkim : public edm::EDFilter { ~CSCSkim(); // Analysis routines - virtual void beginJob() ; + virtual void beginJob() override; virtual bool filter(edm::Event& event, const edm::EventSetup& eventSetup) override; - virtual void endJob() ; + virtual void endJob() override; protected: diff --git a/DPGAnalysis/Skims/interface/EcalTangentFilter.h b/DPGAnalysis/Skims/interface/EcalTangentFilter.h index 1695445c90f45..4fc297242cac4 100644 --- a/DPGAnalysis/Skims/interface/EcalTangentFilter.h +++ b/DPGAnalysis/Skims/interface/EcalTangentFilter.h @@ -25,9 +25,9 @@ class EcalTangentFilter : public edm::EDFilter { ~EcalTangentFilter(); private: - virtual void beginJob() ; + virtual void beginJob() override; virtual bool filter(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data --------------------------- int fNgood, fNtot, fEvt; diff --git a/DPGAnalysis/Skims/interface/MatchedProbeMaker.h b/DPGAnalysis/Skims/interface/MatchedProbeMaker.h index 5b47f18ec9857..cf7817a9823f1 100644 --- a/DPGAnalysis/Skims/interface/MatchedProbeMaker.h +++ b/DPGAnalysis/Skims/interface/MatchedProbeMaker.h @@ -37,9 +37,9 @@ class MatchedProbeMaker : public edm::EDProducer ~MatchedProbeMaker(); private: - virtual void beginJob() ; + virtual void beginJob() override; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data --------------------------- edm::InputTag m_candidateSource; diff --git a/DPGAnalysis/Skims/interface/TagProbeMassEDMFilter.h b/DPGAnalysis/Skims/interface/TagProbeMassEDMFilter.h index 4d822e3bae389..51c5684f7693b 100644 --- a/DPGAnalysis/Skims/interface/TagProbeMassEDMFilter.h +++ b/DPGAnalysis/Skims/interface/TagProbeMassEDMFilter.h @@ -42,9 +42,9 @@ class TagProbeMassEDMFilter : public edm::EDFilter ~TagProbeMassEDMFilter(); private: - virtual void beginJob() ; + virtual void beginJob() override; virtual bool filter(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data --------------------------- std::string tpMapName; diff --git a/DPGAnalysis/Skims/interface/TagProbeMassProducer.h b/DPGAnalysis/Skims/interface/TagProbeMassProducer.h index 537e0995b8ace..a3555f1986ad5 100644 --- a/DPGAnalysis/Skims/interface/TagProbeMassProducer.h +++ b/DPGAnalysis/Skims/interface/TagProbeMassProducer.h @@ -38,9 +38,9 @@ class TagProbeMassProducer : public edm::EDProducer ~TagProbeMassProducer(); private: - virtual void beginJob() ; + virtual void beginJob() override; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; bool isPassingProbe (const unsigned int iprobe) const; diff --git a/DPGAnalysis/Skims/interface/TriggerMatchProducer.h b/DPGAnalysis/Skims/interface/TriggerMatchProducer.h index 817d037994e45..856fdb98210af 100644 --- a/DPGAnalysis/Skims/interface/TriggerMatchProducer.h +++ b/DPGAnalysis/Skims/interface/TriggerMatchProducer.h @@ -28,9 +28,9 @@ class TriggerMatchProducer : public edm::EDProducer private: virtual void beginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override; - virtual void beginJob() ; + virtual void beginJob() override; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data -------------------------- diff --git a/DQM/DataScouting/plugins/RazorVarAnalyzer.h b/DQM/DataScouting/plugins/RazorVarAnalyzer.h index 55a1cbce7c1ab..439d883917b22 100644 --- a/DQM/DataScouting/plugins/RazorVarAnalyzer.h +++ b/DQM/DataScouting/plugins/RazorVarAnalyzer.h @@ -12,7 +12,7 @@ class RazorVarAnalyzer : public ScoutingAnalyzerBase { explicit RazorVarAnalyzer( const edm::ParameterSet & ) ; virtual ~RazorVarAnalyzer() ; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze( const edm::Event & , const edm::EventSetup & ); + virtual void analyze( const edm::Event & , const edm::EventSetup & ) override; private: edm::InputTag m_eleCollectionTag; edm::InputTag m_jetCollectionTag; diff --git a/DQM/EcalMonitorTasks/interface/LedTask.h b/DQM/EcalMonitorTasks/interface/LedTask.h index 5e1a88f12f0cd..7ed5fc726405c 100644 --- a/DQM/EcalMonitorTasks/interface/LedTask.h +++ b/DQM/EcalMonitorTasks/interface/LedTask.h @@ -33,7 +33,7 @@ namespace ecaldqm { void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; private: - void setParams(edm::ParameterSet const&); + void setParams(edm::ParameterSet const&) override; std::map wlToME_; diff --git a/DQM/L1TMonitor/interface/L1TCSCTF.h b/DQM/L1TMonitor/interface/L1TCSCTF.h index 4fb9b2a8f66e7..d933f5126625a 100755 --- a/DQM/L1TMonitor/interface/L1TCSCTF.h +++ b/DQM/L1TMonitor/interface/L1TCSCTF.h @@ -67,8 +67,8 @@ class L1TCSCTF : public thread_unsafe::DQMEDAnalyzer { protected: // Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; //virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; diff --git a/DQM/L1TMonitor/interface/L1TGT.h b/DQM/L1TMonitor/interface/L1TGT.h index 4344d7e8abaa0..9a3180e539ab1 100755 --- a/DQM/L1TMonitor/interface/L1TGT.h +++ b/DQM/L1TMonitor/interface/L1TGT.h @@ -60,13 +60,13 @@ class L1TGT: public DQMEDAnalyzer { protected: //virtual void beginJob(); - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; /// end section - virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TRate.h b/DQM/L1TMonitor/interface/L1TRate.h index 53a5c99aad661..490359e2f9e53 100644 --- a/DQM/L1TMonitor/interface/L1TRate.h +++ b/DQM/L1TMonitor/interface/L1TRate.h @@ -63,7 +63,7 @@ class L1TRate : public DQMEDAnalyzer { virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; // Private methods private: diff --git a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h index e6f8f5699d805..06897a61617e4 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h +++ b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h @@ -31,7 +31,7 @@ class L1TdeStage2CaloLayer1 : public DQMEDAnalyzer { virtual ~L1TdeStage2CaloLayer1(); protected: - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; diff --git a/DQM/RCTMonitor/interface/RCTMonitor.h b/DQM/RCTMonitor/interface/RCTMonitor.h index 16619aa5d0e6d..e72c5cdb941e8 100644 --- a/DQM/RCTMonitor/interface/RCTMonitor.h +++ b/DQM/RCTMonitor/interface/RCTMonitor.h @@ -77,7 +77,7 @@ class RCTMonitor : public DQMEDAnalyzer { ~RCTMonitor(); void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void FillRCT(const edm::Event&, const edm::EventSetup&); private: diff --git a/DQM/SiStripMonitorCluster/interface/MonitorLTC.h b/DQM/SiStripMonitorCluster/interface/MonitorLTC.h index 6e96f9d96fcca..b6f22a03fc6bb 100644 --- a/DQM/SiStripMonitorCluster/interface/MonitorLTC.h +++ b/DQM/SiStripMonitorCluster/interface/MonitorLTC.h @@ -30,7 +30,7 @@ class MonitorLTC : public DQMEDAnalyzer { public: explicit MonitorLTC(const edm::ParameterSet&); ~MonitorLTC(){}; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: DQMStore* dqmStore_; diff --git a/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h b/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h index f16cb8c50f0b1..1d9acd2f50745 100644 --- a/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h +++ b/DQM/SiStripMonitorCluster/interface/SiStripMonitorCluster.h @@ -40,9 +40,9 @@ class SiStripMonitorCluster : public DQMEDAnalyzer { public: explicit SiStripMonitorCluster(const edm::ParameterSet&); ~SiStripMonitorCluster(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) ; + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; struct ModMEs{ // MEs for one single detector module diff --git a/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h b/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h index 83e28cb5e1129..bb828951b8694 100644 --- a/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h +++ b/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h @@ -27,7 +27,7 @@ class SiStripMonitorFilter : public DQMEDAnalyzer { explicit SiStripMonitorFilter(const edm::ParameterSet&); ~SiStripMonitorFilter(){}; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h b/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h index 79b0e713c2b56..5d0c4d7421569 100644 --- a/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h +++ b/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h @@ -27,7 +27,7 @@ class SiStripMonitorHLT : public DQMEDAnalyzer { explicit SiStripMonitorHLT(const edm::ParameterSet&); ~SiStripMonitorHLT(){}; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h index 90094391d8ff2..a952088c44663 100644 --- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h +++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h @@ -59,9 +59,9 @@ class SiStripMonitorPedestals : public DQMEDAnalyzer { ~SiStripMonitorPedestals(); virtual void beginJob() ; - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endRun(edm::Run const& run, edm::EventSetup const& eSetup); - virtual void endJob() ; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; + virtual void endJob(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h index e3fd76b74785f..1bfef75a945b2 100644 --- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h +++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h @@ -50,8 +50,8 @@ class SiStripMonitorQuality : public DQMEDAnalyzer { virtual void beginJob() ; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; virtual void endJob() ; diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h index a18b49fc6f624..e80af94b3ad56 100644 --- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h +++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h @@ -50,8 +50,8 @@ class SiStripMonitorRawData : public DQMEDAnalyzer { virtual void beginJob() ; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; virtual void endJob() ; diff --git a/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h b/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h index 0636bb77121d1..21fac97da4344 100755 --- a/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h +++ b/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h @@ -64,8 +64,8 @@ class SiStripMonitorTrack : public DQMEDAnalyzer { enum RecHitType { Single=0, Matched=1, Projected=2, Null=3}; explicit SiStripMonitorTrack(const edm::ParameterSet&); ~SiStripMonitorTrack(); - void dqmBeginRun(const edm::Run& run, const edm::EventSetup& es) ; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run& run, const edm::EventSetup& es) override; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h b/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h index ee35884a9da7f..a629fc951928c 100644 --- a/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h +++ b/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h @@ -39,8 +39,8 @@ class MonitorTrackResidualsBase : public DQMEDAnalyzer { // constructors and EDAnalyzer Methods explicit MonitorTrackResidualsBase(const edm::ParameterSet&); ~MonitorTrackResidualsBase(); - void dqmBeginRun(const edm::Run& , const edm::EventSetup& ) ; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup& ) override ; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/TrackingMonitor/interface/LogMessageMonitor.h b/DQM/TrackingMonitor/interface/LogMessageMonitor.h index 5ad83f4205a5e..4318f189d4baf 100644 --- a/DQM/TrackingMonitor/interface/LogMessageMonitor.h +++ b/DQM/TrackingMonitor/interface/LogMessageMonitor.h @@ -60,13 +60,13 @@ class LogMessageMonitor : public DQMEDAnalyzer { private: // virtual void beginJob() ; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void endJob() ; // virtual void beginRun(edm::Run const&, edm::EventSetup const&); - virtual void endRun(edm::Run const&, edm::EventSetup const&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); - virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); + virtual void endRun(edm::Run const&, edm::EventSetup const&) override; + virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; + virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h b/DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h index 7b2255a7e2f3e..a126e809e622c 100644 --- a/DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h +++ b/DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h @@ -48,7 +48,7 @@ class TrackEfficiencyMonitor : public DQMEDAnalyzer { ~TrackEfficiencyMonitor(); virtual void beginJob(void); virtual void endJob(void); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/TrackingMonitor/interface/TrackingMonitor.h b/DQM/TrackingMonitor/interface/TrackingMonitor.h index 6b7b2c69f9993..1598a6a8bfd84 100644 --- a/DQM/TrackingMonitor/interface/TrackingMonitor.h +++ b/DQM/TrackingMonitor/interface/TrackingMonitor.h @@ -56,11 +56,11 @@ class TrackingMonitor : public DQMEDAnalyzer virtual void setMaxMinBin(std::vector & ,std::vector & ,std::vector & ,double, double, int, double, double, int); virtual void setNclus(const edm::Event&, std::vector & ); - virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& eSetup); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& eSetup) override; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; // virtual void beginRun(const edm::Run&, const edm::EventSetup&); - virtual void endRun(const edm::Run&, const edm::EventSetup&); + virtual void endRun(const edm::Run&, const edm::EventSetup&) override; private: void doProfileX(TH2 * th2, MonitorElement* me); diff --git a/DQM/TrackingMonitor/interface/V0Monitor.h b/DQM/TrackingMonitor/interface/V0Monitor.h index a18887d8c6623..9a79d595eddbe 100644 --- a/DQM/TrackingMonitor/interface/V0Monitor.h +++ b/DQM/TrackingMonitor/interface/V0Monitor.h @@ -48,7 +48,7 @@ class V0Monitor : public DQMEDAnalyzer MonitorElement* bookHisto1D(DQMStore::IBooker & ibooker,std::string name, std::string title, std::string xaxis, std::string yaxis, MEbinning binning); MonitorElement* bookHisto2D(DQMStore::IBooker & ibooker,std::string name, std::string title, std::string xaxis, std::string yaxis, MEbinning xbinning, MEbinning ybinning); MonitorElement* bookProfile(DQMStore::IBooker & ibooker,std::string name, std::string title, std::string xaxis, std::string yaxis, MEbinning xbinning, MEbinning ybinning); - void analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup); + void analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) override; private: diff --git a/DQM/TrackingMonitor/interface/dEdxAnalyzer.h b/DQM/TrackingMonitor/interface/dEdxAnalyzer.h index 1cc1089390c1a..17f51433900ae 100644 --- a/DQM/TrackingMonitor/interface/dEdxAnalyzer.h +++ b/DQM/TrackingMonitor/interface/dEdxAnalyzer.h @@ -40,14 +40,14 @@ class dEdxAnalyzer : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); virtual void beginJob(); - virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup); + virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; virtual void endJob() ; double mass(double P, double I); // virtual void beginRun(const edm::Run&, const edm::EventSetup&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); - virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); + virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; + virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/TrackingMonitor/interface/dEdxHitAnalyzer.h b/DQM/TrackingMonitor/interface/dEdxHitAnalyzer.h index 686a7d7d2d516..e7d6ff28d613b 100644 --- a/DQM/TrackingMonitor/interface/dEdxHitAnalyzer.h +++ b/DQM/TrackingMonitor/interface/dEdxHitAnalyzer.h @@ -39,10 +39,10 @@ class dEdxHitAnalyzer : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup); + virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; double harmonic2(const reco::DeDxHitInfo* dedxHits); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run &, const edm::EventSetup &); + void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override; private: // ----------member data --------------------------- diff --git a/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h b/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h index 4b005c9a0bf52..1108bda7d1779 100644 --- a/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h +++ b/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h @@ -35,7 +35,7 @@ class StandaloneTrackMonitor : public DQMEDAnalyzer { void processHit(const TrackingRecHit& recHit, edm::EventSetup const& iSetup, const TrackerGeometry& tkGeom, double wfac=1); void processClusters(edm::Event const& iEvent, edm::EventSetup const& iSetup, const TrackerGeometry& tkGeom, double wfac=1); void addClusterToMap(uint32_t detid, const SiStripCluster* cluster); - void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &); + void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h b/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h index 3b1e6a3b1325a..54b530029ad6d 100644 --- a/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h +++ b/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h @@ -31,7 +31,7 @@ class TrackTypeMonitor : public DQMEDAnalyzer { void analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) override; void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override; - void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &); + void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/TrigXMonitor/interface/HLTScalers.h b/DQM/TrigXMonitor/interface/HLTScalers.h index 169ae3d72082e..c781b7e06b771 100644 --- a/DQM/TrigXMonitor/interface/HLTScalers.h +++ b/DQM/TrigXMonitor/interface/HLTScalers.h @@ -68,16 +68,16 @@ class HLTScalers : public DQMEDAnalyzer { HLTScalers(const edm::ParameterSet &ps); virtual ~HLTScalers(){}; void beginJob(void); - void dqmBeginRun(const edm::Run &run, const edm::EventSetup &c); + void dqmBeginRun(const edm::Run &run, const edm::EventSetup &c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void beginLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &c); - void analyze(const edm::Event &e, const edm::EventSetup &c); + const edm::EventSetup &c) override; + void analyze(const edm::Event &e, const edm::EventSetup &c) override; /// DQM Client Diagnostic should be performed here: void endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &c); - void endRun(const edm::Run &run, const edm::EventSetup &c); + const edm::EventSetup &c) override; + void endRun(const edm::Run &run, const edm::EventSetup &c) override; private: HLTConfigProvider hltConfig_; diff --git a/DQM/TrigXMonitor/interface/HLTSeedL1LogicScalers.h b/DQM/TrigXMonitor/interface/HLTSeedL1LogicScalers.h index a0f7313a059a5..74f2cc0034705 100644 --- a/DQM/TrigXMonitor/interface/HLTSeedL1LogicScalers.h +++ b/DQM/TrigXMonitor/interface/HLTSeedL1LogicScalers.h @@ -49,10 +49,10 @@ class HLTSeedL1LogicScalers : public DQMEDAnalyzer { ~HLTSeedL1LogicScalers(); private: - void dqmBeginRun(const edm::Run &run, const edm::EventSetup &c); + void dqmBeginRun(const edm::Run &run, const edm::EventSetup &c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; bool analyzeL1GtUtils(const edm::Event&, const edm::EventSetup&, const std::string&); diff --git a/DQM/TrigXMonitor/interface/L1Scalers.h b/DQM/TrigXMonitor/interface/L1Scalers.h index f697ee5dbdc3b..6d31ef9d39979 100644 --- a/DQM/TrigXMonitor/interface/L1Scalers.h +++ b/DQM/TrigXMonitor/interface/L1Scalers.h @@ -20,10 +20,10 @@ class L1Scalers : public DQMEDAnalyzer { virtual ~L1Scalers(){}; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event &e, const edm::EventSetup &c); + void analyze(const edm::Event &e, const edm::EventSetup &c) override; /// DQM Client Diagnostic should be performed here: void endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &c); + const edm::EventSetup &c) override; private: int nev_; // Number of events processed diff --git a/DQM/TrigXMonitor/interface/L1TScalersSCAL.h b/DQM/TrigXMonitor/interface/L1TScalersSCAL.h index 0eb4379a95988..8d89dc0e2db1e 100644 --- a/DQM/TrigXMonitor/interface/L1TScalersSCAL.h +++ b/DQM/TrigXMonitor/interface/L1TScalersSCAL.h @@ -21,7 +21,7 @@ class L1TScalersSCAL : public DQMEDAnalyzer { virtual ~L1TScalersSCAL(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: edm::EDGetTokenT l1triggerscalers_; edm::EDGetTokenT lumiscalers_; diff --git a/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h b/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h index 15e615981a30c..9a59df38b51c9 100755 --- a/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h +++ b/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h @@ -38,13 +38,13 @@ class DQMSourceEleCalib : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event& e, const edm::EventSetup& c) ; + void analyze(const edm::Event& e, const edm::EventSetup& c) override ; void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) ; + const edm::EventSetup& context) override; void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c); + const edm::EventSetup& c) override; private: diff --git a/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h b/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h index e6864814cd48a..947a3567ef7b2 100644 --- a/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h +++ b/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h @@ -15,7 +15,7 @@ class DQMHOAlCaRecoStream : public DQMEDAnalyzer { private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h index f431d0462729d..013b09dfda341 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h +++ b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h @@ -35,10 +35,10 @@ class DQMHcalDiJetsAlCaReco : public DQMEDAnalyzer { virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event& e, const edm::EventSetup& c) ; + void analyze(const edm::Event& e, const edm::EventSetup& c) override ; void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) ; + const edm::EventSetup& context) override ; private: diff --git a/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h index 8c23748dd4d7d..2e19baf1c3b1d 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h +++ b/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h @@ -33,15 +33,15 @@ class DQMHcalIsolatedBunchAlCaReco : public DQMEDAnalyzer { protected: virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event& e, const edm::EventSetup& c) ; + void analyze(const edm::Event& e, const edm::EventSetup& c) override ; void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) { } + const edm::EventSetup& context) override { } void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c) { } + const edm::EventSetup& c) override { } - void endRun(const edm::Run& r, const edm::EventSetup& c) { } + void endRun(const edm::Run& r, const edm::EventSetup& c) override { } private: diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h index 04cff234daa6f..713dbc4c5fc80 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h +++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h @@ -32,15 +32,15 @@ class DQMHcalPhiSymAlCaReco : public DQMEDAnalyzer { // void beginRun(const edm::Run& r, const edm::EventSetup& c); virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event& e, const edm::EventSetup& c) ; + void analyze(const edm::Event& e, const edm::EventSetup& c) override ; void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) ; + const edm::EventSetup& context) override ; void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c); + const edm::EventSetup& c) override; - void endRun(const edm::Run& r, const edm::EventSetup& c); + void endRun(const edm::Run& r, const edm::EventSetup& c) override; private: diff --git a/DQMOffline/CalibCalo/src/DQMSourcePi0.h b/DQMOffline/CalibCalo/src/DQMSourcePi0.h index 9203897624ad7..db04456ab687f 100755 --- a/DQMOffline/CalibCalo/src/DQMSourcePi0.h +++ b/DQMOffline/CalibCalo/src/DQMSourcePi0.h @@ -54,15 +54,15 @@ class DQMSourcePi0 : public DQMEDAnalyzer { // void beginRun(const edm::Run& r, const edm::EventSetup& c); virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event& e, const edm::EventSetup& c) ; + void analyze(const edm::Event& e, const edm::EventSetup& c) override ; void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) ; + const edm::EventSetup& context) override; void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c); + const edm::EventSetup& c) override; - void endRun(const edm::Run& r, const edm::EventSetup& c); + void endRun(const edm::Run& r, const edm::EventSetup& c) override; void endJob(); diff --git a/DQMOffline/EGamma/interface/ElectronDqmAnalyzerBase.h b/DQMOffline/EGamma/interface/ElectronDqmAnalyzerBase.h index fe79d9c12e693..c02bd051c9816 100644 --- a/DQMOffline/EGamma/interface/ElectronDqmAnalyzerBase.h +++ b/DQMOffline/EGamma/interface/ElectronDqmAnalyzerBase.h @@ -25,13 +25,13 @@ class ElectronDqmAnalyzerBase : public DQMEDAnalyzer virtual ~ElectronDqmAnalyzerBase() ; // specific implementation of EDAnalyzer - virtual void endRun( edm::Run const &, edm::EventSetup const & ) ; - virtual void endLuminosityBlock( edm::LuminosityBlock const &, edm::EventSetup const & ) ; - virtual void dqmBeginRun( edm::Run const & , edm::EventSetup const & ) ; + virtual void endRun( edm::Run const &, edm::EventSetup const & ) override; + virtual void endLuminosityBlock( edm::LuminosityBlock const &, edm::EventSetup const & ) override ; + virtual void dqmBeginRun( edm::Run const & , edm::EventSetup const & ) override; void bookHistograms( DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; // interface to implement in derived classes - virtual void analyze( const edm::Event & e, const edm::EventSetup & c ) {} + virtual void analyze( const edm::Event & e, const edm::EventSetup & c ) override {} // utility methods bool finalStepDone() { return finalDone_ ; } diff --git a/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h b/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h index c9a1368202007..3cefbaf470d02 100644 --- a/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h +++ b/DQMOffline/EGamma/interface/ElectronDqmHarvesterBase.h @@ -25,8 +25,8 @@ class ElectronDqmHarvesterBase : public DQMEDHarvester virtual ~ElectronDqmHarvesterBase() ; // specific implementation of EDAnalyzer - void beginJob() ; // prepare DQM, open input field if declared, and call book() below - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + void beginJob() override ; // prepare DQM, open input field if declared, and call book() below + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&) override; //performed in the endLumi void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob // interface to implement in derived classes diff --git a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h index 47928396d1871..5c4adbde3fbff 100755 --- a/DQMOffline/EGamma/plugins/PhotonAnalyzer.h +++ b/DQMOffline/EGamma/plugins/PhotonAnalyzer.h @@ -104,7 +104,7 @@ class PhotonAnalyzer : public DQMEDAnalyzer explicit PhotonAnalyzer( const edm::ParameterSet& ); virtual ~PhotonAnalyzer(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze( const edm::Event&, const edm::EventSetup& ); + virtual void analyze( const edm::Event&, const edm::EventSetup& ) override; private: void bookHistogramsForHistogramCounts(DQMStore::IBooker &); diff --git a/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h b/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h index 0aa0a2d8bd4a0..d7ef2f015c7c8 100755 --- a/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h +++ b/DQMOffline/EGamma/plugins/PiZeroAnalyzer.h @@ -81,7 +81,7 @@ class PiZeroAnalyzer : public DQMEDAnalyzer explicit PiZeroAnalyzer( const edm::ParameterSet& ) ; virtual ~PiZeroAnalyzer(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze( const edm::Event&, const edm::EventSetup& ) ; + virtual void analyze( const edm::Event&, const edm::EventSetup& ) override ; private: void makePizero(const edm::EventSetup& es, const edm::Handle eb, const edm::Handle ee ); diff --git a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h index 7cbed0059b2dc..296409f2ccec2 100755 --- a/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h +++ b/DQMOffline/EGamma/plugins/ZToMuMuGammaAnalyzer.h @@ -103,7 +103,7 @@ class ZToMuMuGammaAnalyzer : public DQMEDAnalyzer explicit ZToMuMuGammaAnalyzer(const edm::ParameterSet&); virtual ~ZToMuMuGammaAnalyzer(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze( const edm::Event&, const edm::EventSetup&); + virtual void analyze( const edm::Event&, const edm::EventSetup&) override; private: edm::EDGetTokenT > photon_token_; diff --git a/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h b/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h index eb55feba60909..9ca57765b3593 100644 --- a/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h +++ b/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h @@ -34,7 +34,7 @@ class CaloTowersAnalyzer : public DQMEDAnalyzer { CaloTowersAnalyzer(edm::ParameterSet const& conf); ~CaloTowersAnalyzer(); - virtual void analyze(edm::Event const& e, edm::EventSetup const& c); + virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override; virtual void beginJob() ; virtual void endJob() ; virtual void beginRun() ; diff --git a/DQMOffline/Hcal/interface/CaloTowersDQMClient.h b/DQMOffline/Hcal/interface/CaloTowersDQMClient.h index bff79659647e0..003ede33aa752 100644 --- a/DQMOffline/Hcal/interface/CaloTowersDQMClient.h +++ b/DQMOffline/Hcal/interface/CaloTowersDQMClient.h @@ -54,9 +54,9 @@ class CaloTowersDQMClient : public DQMEDHarvester { explicit CaloTowersDQMClient(const edm::ParameterSet& ); virtual ~CaloTowersDQMClient(); - virtual void beginJob(void); + virtual void beginJob(void) override; virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob - virtual void beginRun(const edm::Run& run, const edm::EventSetup& c); + virtual void beginRun(const edm::Run& run, const edm::EventSetup& c) override; int CaloTowersEndjob(const std::vector &hcalMEs); diff --git a/DQMOffline/Hcal/interface/HcalNoiseRates.h b/DQMOffline/Hcal/interface/HcalNoiseRates.h index 2294f00eb013e..aeb045f12b765 100644 --- a/DQMOffline/Hcal/interface/HcalNoiseRates.h +++ b/DQMOffline/Hcal/interface/HcalNoiseRates.h @@ -50,7 +50,7 @@ class HcalNoiseRates : public DQMEDAnalyzer { private: virtual void beginJob(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void endJob(); virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h b/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h index 7c75f39e3d5bc..5bed133b6e641 100644 --- a/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h +++ b/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h @@ -55,9 +55,9 @@ class HcalNoiseRatesClient : public DQMEDHarvester { explicit HcalNoiseRatesClient(const edm::ParameterSet& ); virtual ~HcalNoiseRatesClient(); - virtual void beginJob(void); + virtual void beginJob(void) override; virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob - virtual void beginRun(const edm::Run& run, const edm::EventSetup& c); + virtual void beginRun(const edm::Run& run, const edm::EventSetup& c) override; int NoiseRatesEndjob(const std::vector &hcalMEs); diff --git a/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h b/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h index 8e7919efb9d73..e5a821487d514 100644 --- a/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h +++ b/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h @@ -62,7 +62,7 @@ class HcalRecHitsAnalyzer : public DQMEDAnalyzer { virtual void analyze(edm::Event const& ev, edm::EventSetup const& c) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; //virtual void beginRun(edm::Run const& run, edm::EventSetup const& c) override; - virtual void dqmBeginRun(const edm::Run& run, const edm::EventSetup& c); + virtual void dqmBeginRun(const edm::Run& run, const edm::EventSetup& c) override; private: virtual void fillRecHitsTmp(int subdet_, edm::Event const& ev); diff --git a/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h b/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h index 63edeaf75eaf7..0c9b2abc53a78 100644 --- a/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h +++ b/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h @@ -68,8 +68,8 @@ class HcalRecHitsDQMClient : public DQMEDHarvester { explicit HcalRecHitsDQMClient(const edm::ParameterSet& ); virtual ~HcalRecHitsDQMClient(); - virtual void beginJob(void); - virtual void beginRun(edm::Run const&, edm::EventSetup const&); + virtual void beginJob(void) override; + virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob int HcalRecHitsEndjob(const std::vector &hcalMEs); diff --git a/DQMOffline/JetMET/interface/BeamHaloAnalyzer.h b/DQMOffline/JetMET/interface/BeamHaloAnalyzer.h index 47b424c4ac495..8111a32712500 100644 --- a/DQMOffline/JetMET/interface/BeamHaloAnalyzer.h +++ b/DQMOffline/JetMET/interface/BeamHaloAnalyzer.h @@ -159,7 +159,7 @@ class BeamHaloAnalyzer: public DQMEDAnalyzer { private: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze(const edm::Event& , const edm::EventSetup&); + virtual void analyze(const edm::Event& , const edm::EventSetup&) override; edm::InputTag IT_L1MuGMTReadout; diff --git a/DQMOffline/JetMET/interface/CaloTowerAnalyzer.h b/DQMOffline/JetMET/interface/CaloTowerAnalyzer.h index f499cafc9bc15..60ad6693b1c56 100644 --- a/DQMOffline/JetMET/interface/CaloTowerAnalyzer.h +++ b/DQMOffline/JetMET/interface/CaloTowerAnalyzer.h @@ -26,7 +26,7 @@ class CaloTowerAnalyzer: public DQMEDAnalyzer { explicit CaloTowerAnalyzer(const edm::ParameterSet&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void dqmbeginRun(const edm::Run& ,const edm::EventSetup&); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/JetMET/interface/ECALRecHitAnalyzer.h b/DQMOffline/JetMET/interface/ECALRecHitAnalyzer.h index 39613d0a049e8..73a4ee4137c52 100644 --- a/DQMOffline/JetMET/interface/ECALRecHitAnalyzer.h +++ b/DQMOffline/JetMET/interface/ECALRecHitAnalyzer.h @@ -85,7 +85,7 @@ class ECALRecHitAnalyzer : public DQMEDAnalyzer { ECALRecHitAnalyzer(const edm::ParameterSet&); //~ECALRecHitAnalyzer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; // virtual void beginJob(void) ; virtual void dqmbeginRun(const edm::Run&, const edm::EventSetup&) ; diff --git a/DQMOffline/JetMET/interface/HCALRecHitAnalyzer.h b/DQMOffline/JetMET/interface/HCALRecHitAnalyzer.h index a398037de8002..ed163a2b9483e 100644 --- a/DQMOffline/JetMET/interface/HCALRecHitAnalyzer.h +++ b/DQMOffline/JetMET/interface/HCALRecHitAnalyzer.h @@ -28,11 +28,11 @@ class HCALRecHitAnalyzer: public DQMEDAnalyzer { explicit HCALRecHitAnalyzer(const edm::ParameterSet&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; // virtual void beginJob(void); // virtual void beginRun(const edm::Run&, const edm::EventSetup&); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) ; + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override ; private: diff --git a/DQMOffline/JetMET/interface/JetAnalyzer.h b/DQMOffline/JetMET/interface/JetAnalyzer.h index e970ba7becb25..94c5285aff560 100644 --- a/DQMOffline/JetMET/interface/JetAnalyzer.h +++ b/DQMOffline/JetMET/interface/JetAnalyzer.h @@ -94,14 +94,14 @@ class JetAnalyzer : public DQMEDAnalyzer { // void beginJob(void); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; /// Get the analysis - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; /// Initialize run-based parameters - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; /// Finish up a run - void endRun(const edm::Run&, const edm::EventSetup&); + void endRun(const edm::Run&, const edm::EventSetup&) override; private: diff --git a/DQMOffline/JetMET/interface/METAnalyzer.h b/DQMOffline/JetMET/interface/METAnalyzer.h index a9e0d57b22ac1..4ac782d4ad2a8 100644 --- a/DQMOffline/JetMET/interface/METAnalyzer.h +++ b/DQMOffline/JetMET/interface/METAnalyzer.h @@ -108,13 +108,13 @@ class METAnalyzer : public DQMEDAnalyzer{ //void bookMonitorElement(std::string, bool); /// Get the analysis - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; /// Initialize run-based parameters - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; /// Finish up a run - void endRun(const edm::Run& iRun, const edm::EventSetup& iSetup); + void endRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override; // void endRun(const edm::Run& iRun, const edm::EventSetup& iSetup); // Fill MonitorElements void fillMESet(const edm::Event&, std::string, const reco::MET&, const pat::MET&, const reco::PFMET&, const reco::CaloMET&, const reco::Candidate::PolarLorentzVector&, std::map&,std::vector,std::vector); diff --git a/DQMOffline/JetMET/interface/SUSYDQMAnalyzer.h b/DQMOffline/JetMET/interface/SUSYDQMAnalyzer.h index ccd5a2547e5ff..e0d89280ba219 100644 --- a/DQMOffline/JetMET/interface/SUSYDQMAnalyzer.h +++ b/DQMOffline/JetMET/interface/SUSYDQMAnalyzer.h @@ -28,7 +28,7 @@ class SUSYDQMAnalyzer: public DQMEDAnalyzer { edm::ParameterSet iConfig; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze(const edm::Event& , const edm::EventSetup&); + virtual void analyze(const edm::Event& , const edm::EventSetup&) override; edm::EDGetTokenT thePFMETCollectionToken; edm::EDGetTokenT > thePFJetCollectionToken; diff --git a/DQMOffline/L1Trigger/interface/L1TEfficiencyMuons_Offline.h b/DQMOffline/L1Trigger/interface/L1TEfficiencyMuons_Offline.h index 6852f2c44e31d..cedcd1549de59 100644 --- a/DQMOffline/L1Trigger/interface/L1TEfficiencyMuons_Offline.h +++ b/DQMOffline/L1Trigger/interface/L1TEfficiencyMuons_Offline.h @@ -117,16 +117,16 @@ class L1TEfficiencyMuons_Offline : public DQMEDAnalyzer { protected: // Luminosity Block - virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); + virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; virtual void dqmEndLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); - virtual void dqmBeginRun(const edm::Run& run, const edm::EventSetup& iSetup); + virtual void dqmBeginRun(const edm::Run& run, const edm::EventSetup& iSetup) override; virtual void bookControlHistos(DQMStore::IBooker &); virtual void bookEfficiencyHistos(DQMStore::IBooker &ibooker, int ptCut); virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& run, const edm::EventSetup& iSetup) override; //virtual void analyze (const edm::Event& e, const edm::EventSetup& c); private: - void analyze (const edm::Event& e, const edm::EventSetup& c); + void analyze (const edm::Event& e, const edm::EventSetup& c) override; // Helper Functions const reco::Vertex getPrimaryVertex(edm::Handle & vertex,edm::Handle & beamSpot); diff --git a/DQMOffline/L1Trigger/interface/L1TRate_Offline.h b/DQMOffline/L1Trigger/interface/L1TRate_Offline.h index 2acc085fa8be1..6d9a9b58ef522 100644 --- a/DQMOffline/L1Trigger/interface/L1TRate_Offline.h +++ b/DQMOffline/L1Trigger/interface/L1TRate_Offline.h @@ -59,12 +59,12 @@ class L1TRate_Offline : public DQMEDAnalyzer { protected: - void analyze (const edm::Event& e, const edm::EventSetup& c); // Analyze + void analyze (const edm::Event& e, const edm::EventSetup& c) override; // Analyze virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& run, const edm::EventSetup& iSetup) override; - virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); - virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; + virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; // Private methods //private: diff --git a/DQMOffline/L1Trigger/interface/L1TSync_Offline.h b/DQMOffline/L1Trigger/interface/L1TSync_Offline.h index 42405cd829a18..234d909524e28 100644 --- a/DQMOffline/L1Trigger/interface/L1TSync_Offline.h +++ b/DQMOffline/L1Trigger/interface/L1TSync_Offline.h @@ -107,9 +107,9 @@ class L1TSync_Offline : public DQMEDAnalyzer { protected: - void analyze (const edm::Event& e, const edm::EventSetup& c); // Analyze - virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void analyze (const edm::Event& e, const edm::EventSetup& c) override; // Analyze + virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; // no lumi block // virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); diff --git a/DQMOffline/Muon/interface/CSCOfflineMonitor.h b/DQMOffline/Muon/interface/CSCOfflineMonitor.h index 0d2a9a3c9acc1..29082a9d964b8 100644 --- a/DQMOffline/Muon/interface/CSCOfflineMonitor.h +++ b/DQMOffline/Muon/interface/CSCOfflineMonitor.h @@ -81,7 +81,7 @@ class CSCOfflineMonitor : public DQMEDAnalyzer { protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event & event, const edm::EventSetup& eventSetup); + void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override; private: diff --git a/DQMOffline/Muon/interface/DTSegmentsTask.h b/DQMOffline/Muon/interface/DTSegmentsTask.h index 6cfbcf6e53264..ca31024ad67be 100644 --- a/DQMOffline/Muon/interface/DTSegmentsTask.h +++ b/DQMOffline/Muon/interface/DTSegmentsTask.h @@ -33,7 +33,7 @@ class DTSegmentsTask: public DQMEDAnalyzer{ virtual ~DTSegmentsTask(); /// book the histos - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; protected: diff --git a/DQMOffline/Muon/interface/DiMuonHistograms.h b/DQMOffline/Muon/interface/DiMuonHistograms.h index 80c7eaeea8938..5385e88ff0f7c 100644 --- a/DQMOffline/Muon/interface/DiMuonHistograms.h +++ b/DQMOffline/Muon/interface/DiMuonHistograms.h @@ -39,7 +39,7 @@ class DiMuonHistograms : public DQMEDAnalyzer { virtual ~DiMuonHistograms() ; /* Operations */ - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/EfficiencyAnalyzer.h b/DQMOffline/Muon/interface/EfficiencyAnalyzer.h index 581670d7fc959..52bd6c0476d14 100644 --- a/DQMOffline/Muon/interface/EfficiencyAnalyzer.h +++ b/DQMOffline/Muon/interface/EfficiencyAnalyzer.h @@ -43,7 +43,7 @@ class EfficiencyAnalyzer : public DQMEDAnalyzer { virtual ~EfficiencyAnalyzer() ; /* Operations */ - void analyze(const edm::Event & event, const edm::EventSetup& eventSetup); + void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h index 6561f7dd838f7..1748367c2719f 100644 --- a/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonEnergyDepositAnalyzer.h @@ -39,7 +39,7 @@ class MuonEnergyDepositAnalyzer : public DQMEDAnalyzer{ virtual ~MuonEnergyDepositAnalyzer(); /* Operations */ - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonIdDQM.h b/DQMOffline/Muon/interface/MuonIdDQM.h index b787c953ba7c3..824004f5b65e8 100644 --- a/DQMOffline/Muon/interface/MuonIdDQM.h +++ b/DQMOffline/Muon/interface/MuonIdDQM.h @@ -53,7 +53,7 @@ class MuonIdDQM : public DQMEDAnalyzer { ~MuonIdDQM(); /* Operations */ - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonIsolationDQM.h b/DQMOffline/Muon/interface/MuonIsolationDQM.h index a39a7a5d2653a..9847dbbe76436 100644 --- a/DQMOffline/Muon/interface/MuonIsolationDQM.h +++ b/DQMOffline/Muon/interface/MuonIsolationDQM.h @@ -69,7 +69,7 @@ class MuonIsolationDQM : public DQMEDAnalyzer { explicit MuonIsolationDQM(const edm::ParameterSet&); ~MuonIsolationDQM(); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h b/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h index ec80eef6f683e..2afea841d0127 100644 --- a/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h @@ -40,7 +40,7 @@ class MuonKinVsEtaAnalyzer : public DQMEDAnalyzer { /// Destructor ~MuonKinVsEtaAnalyzer(); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonMiniAOD.h b/DQMOffline/Muon/interface/MuonMiniAOD.h index a0e463c6634f0..2992a99f5d09c 100644 --- a/DQMOffline/Muon/interface/MuonMiniAOD.h +++ b/DQMOffline/Muon/interface/MuonMiniAOD.h @@ -36,7 +36,7 @@ class MuonMiniAOD : public DQMEDAnalyzer { virtual ~MuonMiniAOD(); /// Inizialize parameters for histo binning - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/Muon/interface/MuonPFAnalyzer.h b/DQMOffline/Muon/interface/MuonPFAnalyzer.h index 69093eb960210..73d354ae37b42 100644 --- a/DQMOffline/Muon/interface/MuonPFAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonPFAnalyzer.h @@ -44,7 +44,7 @@ class MuonPFAnalyzer : public DQMEDAnalyzer { /// Destructor ~MuonPFAnalyzer(); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonRecoAnalyzer.h b/DQMOffline/Muon/interface/MuonRecoAnalyzer.h index 9ea4c7a8ba30d..70a85f0b51a46 100644 --- a/DQMOffline/Muon/interface/MuonRecoAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonRecoAnalyzer.h @@ -36,7 +36,7 @@ class MuonRecoAnalyzer : public DQMEDAnalyzer { virtual ~MuonRecoAnalyzer(); /// Inizialize parameters for histo binning - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; //calculate residual & pull: diff --git a/DQMOffline/Muon/interface/MuonRecoOneHLT.h b/DQMOffline/Muon/interface/MuonRecoOneHLT.h index 784c85ad158cf..0ba1675b4cfbd 100644 --- a/DQMOffline/Muon/interface/MuonRecoOneHLT.h +++ b/DQMOffline/Muon/interface/MuonRecoOneHLT.h @@ -53,7 +53,7 @@ class MuonRecoOneHLT : public DQMEDAnalyzer { /// Destructor ~MuonRecoOneHLT(); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h b/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h index 7314d3f3ef7b5..4f29989c4b37f 100644 --- a/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h +++ b/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h @@ -38,7 +38,7 @@ class MuonSeedsAnalyzer : public DQMEDAnalyzer { /// Destructor virtual ~MuonSeedsAnalyzer(); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/Muon/interface/SegmentTrackAnalyzer.h b/DQMOffline/Muon/interface/SegmentTrackAnalyzer.h index 900739f2e2731..b19e89b414557 100644 --- a/DQMOffline/Muon/interface/SegmentTrackAnalyzer.h +++ b/DQMOffline/Muon/interface/SegmentTrackAnalyzer.h @@ -41,7 +41,7 @@ class SegmentTrackAnalyzer : public DQMEDAnalyzer { delete theSegmentsAssociator; }; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h index e2855dac638b0..b0ee8960f83e1 100644 --- a/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h +++ b/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h @@ -15,7 +15,7 @@ class CandidateBenchmarkAnalyzer: public BenchmarkAnalyzer, public CandidateBenc CandidateBenchmarkAnalyzer(const edm::ParameterSet& parameterSet); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h index 2af570c9d7d96..0b747cd20de30 100644 --- a/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h +++ b/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h @@ -14,7 +14,7 @@ class METBenchmarkAnalyzer: public BenchmarkAnalyzer, public METBenchmark { METBenchmarkAnalyzer(const edm::ParameterSet& parameterSet); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h index ae9a580f8fe3c..ef7764a3e69c2 100644 --- a/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h +++ b/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h @@ -13,7 +13,7 @@ class MatchMETBenchmarkAnalyzer: public BenchmarkAnalyzer, public MatchMETBenchm MatchMETBenchmarkAnalyzer(const edm::ParameterSet& parameterSet); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void beginJob(){}; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h index 610d6beda1030..24deeb469994a 100644 --- a/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h +++ b/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h @@ -14,7 +14,7 @@ class PFCandidateBenchmarkAnalyzer: public BenchmarkAnalyzer, public PFCandidate PFCandidateBenchmarkAnalyzer(const edm::ParameterSet& parameterSet); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h index c6c6ca0a9595e..2b7dbafc2b41f 100644 --- a/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h +++ b/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h @@ -18,7 +18,7 @@ class PFCandidateDQMAnalyzer: public DQMEDAnalyzer { PFCandidateDQMAnalyzer(const edm::ParameterSet& parameterSet); private: - void analyze(edm::Event const&, edm::EventSetup const&); + void analyze(edm::Event const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h b/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h index c5fca0cf62a19..955257ae1b28f 100644 --- a/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h +++ b/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h @@ -14,7 +14,7 @@ class PFCandidateManagerAnalyzer: public BenchmarkAnalyzer, public PFCandidateMa PFCandidateManagerAnalyzer(const edm::ParameterSet& parameterSet); - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h index d7cecd12cdec0..a1cb25e228cb4 100644 --- a/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h +++ b/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h @@ -18,7 +18,7 @@ class PFJetDQMAnalyzer: public DQMEDAnalyzer { PFJetDQMAnalyzer(const edm::ParameterSet& parameterSet); private: - void analyze(edm::Event const&, edm::EventSetup const&); + void analyze(edm::Event const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h index 6886aa6ba7f29..c9747a54f6525 100644 --- a/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h +++ b/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h @@ -18,7 +18,7 @@ class PFMETDQMAnalyzer: public DQMEDAnalyzer { PFMETDQMAnalyzer(const edm::ParameterSet& parameterSet); private: - void analyze(edm::Event const&, edm::EventSetup const&); + void analyze(edm::Event const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h index b3858d7a4b8b7..cffe7a3b48974 100644 --- a/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h +++ b/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h @@ -18,7 +18,7 @@ class PFMuonDQMAnalyzer: public DQMEDAnalyzer { PFMuonDQMAnalyzer(const edm::ParameterSet& parameterSet); private: - void analyze(edm::Event const&, edm::EventSetup const&); + void analyze(edm::Event const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQMOffline/RecoB/plugins/BTagPerformanceAnalyzerOnData.h b/DQMOffline/RecoB/plugins/BTagPerformanceAnalyzerOnData.h index e2f35052104e6..575d4b94e2d5b 100644 --- a/DQMOffline/RecoB/plugins/BTagPerformanceAnalyzerOnData.h +++ b/DQMOffline/RecoB/plugins/BTagPerformanceAnalyzerOnData.h @@ -23,7 +23,7 @@ class BTagPerformanceAnalyzerOnData : public DQMEDAnalyzer { ~BTagPerformanceAnalyzerOnData(); - virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup); + virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; private: diff --git a/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h b/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h index 9413ce246b9ee..2f6f39ca527aa 100644 --- a/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h +++ b/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h @@ -50,7 +50,7 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer { ~BTVHLTOfflineSource(); private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const & run, edm::EventSetup const & c) override; virtual void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override; diff --git a/DQMOffline/Trigger/interface/EgHLTOfflineClient.h b/DQMOffline/Trigger/interface/EgHLTOfflineClient.h index 8ad180ab63e36..ff95d2cbbfb19 100644 --- a/DQMOffline/Trigger/interface/EgHLTOfflineClient.h +++ b/DQMOffline/Trigger/interface/EgHLTOfflineClient.h @@ -85,7 +85,7 @@ class EgHLTOfflineClient : public DQMEDHarvester { // virtual void beginJob(); // virtual void analyze(const edm::Event&, const edm::EventSetup&); //dummy // virtual void endJob(); - virtual void beginRun(const edm::Run& run, const edm::EventSetup& c); + virtual void beginRun(const edm::Run& run, const edm::EventSetup& c) override; // virtual void endRun(const edm::Run& run, const edm::EventSetup& c); // virtual void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& context){} @@ -93,7 +93,7 @@ class EgHLTOfflineClient : public DQMEDHarvester { // virtual void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c); void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, - edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + edm::LuminosityBlock const &, edm::EventSetup const&) override; //performed in the endLumi //at somepoint these all may migrate to a helper class void createN1EffHists(const std::string& filterName, const std::string& baseName, diff --git a/DQMOffline/Trigger/interface/EventShapeDQM.h b/DQMOffline/Trigger/interface/EventShapeDQM.h index c7ce019d096b8..598d62925a615 100644 --- a/DQMOffline/Trigger/interface/EventShapeDQM.h +++ b/DQMOffline/Trigger/interface/EventShapeDQM.h @@ -27,7 +27,7 @@ class EventShapeDQM: public DQMEDAnalyzer{ protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; private: edm::EDGetTokenT triggerResults_; diff --git a/DQMOffline/Trigger/interface/HeavyIonUCCDQM.h b/DQMOffline/Trigger/interface/HeavyIonUCCDQM.h index 15f1e124a9a27..5c42f66d51b97 100644 --- a/DQMOffline/Trigger/interface/HeavyIonUCCDQM.h +++ b/DQMOffline/Trigger/interface/HeavyIonUCCDQM.h @@ -30,7 +30,7 @@ class HeavyIonUCCDQM: public DQMEDAnalyzer{ protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; private: edm::EDGetTokenT triggerResults_; diff --git a/DQMOffline/Trigger/interface/HotlineDQM.h b/DQMOffline/Trigger/interface/HotlineDQM.h index 5154f091ff3a0..b7a355504ead1 100644 --- a/DQMOffline/Trigger/interface/HotlineDQM.h +++ b/DQMOffline/Trigger/interface/HotlineDQM.h @@ -46,7 +46,7 @@ class HotlineDQM: public DQMEDAnalyzer{ protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; private: //variables from config file diff --git a/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h b/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h index 5239c5617f7b7..bc2c3d7a77b7e 100644 --- a/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h +++ b/DQMOffline/Trigger/interface/JetMETHLTOfflineSource.h @@ -70,7 +70,7 @@ class JetMETHLTOfflineSource : public DQMEDAnalyzer { ~JetMETHLTOfflineSource(); private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const & run, edm::EventSetup const & c) override; virtual void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override; diff --git a/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h b/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h index 6eaf1be383313..0130588d496a3 100644 --- a/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h +++ b/DQMOffline/Trigger/interface/TopDiLeptonHLTOfflineDQM.h @@ -260,8 +260,8 @@ class TopDiLeptonHLTOfflineDQM : public DQMEDAnalyzer { } /// do this during the event loop - virtual void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c); - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override; + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h b/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h index 1e2eea291335f..c602052eea713 100644 --- a/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h +++ b/DQMOffline/Trigger/interface/TopSingleLeptonHLTOfflineDQM.h @@ -238,8 +238,8 @@ class TopSingleLeptonHLTOfflineDQM : public DQMEDAnalyzer { }; /// do this during the event loop - virtual void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c); - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override; + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQMOffline/Trigger/src/HLTMuonCertSummary.cc b/DQMOffline/Trigger/src/HLTMuonCertSummary.cc index f2d8cf5a4c2d3..279c354df2176 100644 --- a/DQMOffline/Trigger/src/HLTMuonCertSummary.cc +++ b/DQMOffline/Trigger/src/HLTMuonCertSummary.cc @@ -63,7 +63,7 @@ class HLTMuonCertSummary : public DQMEDHarvester { ~HLTMuonCertSummary(); - virtual void beginJob(); + virtual void beginJob() override; virtual void beginRun(const edm::Run&, const edm::EventSetup&) override ; virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override ; diff --git a/DQMServices/Components/src/DQMDcsInfo.h b/DQMServices/Components/src/DQMDcsInfo.h index 94a9a08fc6e95..b600dbdfd0366 100644 --- a/DQMServices/Components/src/DQMDcsInfo.h +++ b/DQMServices/Components/src/DQMDcsInfo.h @@ -35,9 +35,9 @@ class DQMDcsInfo: public DQMEDAnalyzer{ protected: /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void endLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c); + void endLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c) override; private: diff --git a/DQMServices/Components/src/DQMEventInfo.h b/DQMServices/Components/src/DQMEventInfo.h index f66762b66b337..f701c015db9ec 100644 --- a/DQMServices/Components/src/DQMEventInfo.h +++ b/DQMServices/Components/src/DQMEventInfo.h @@ -42,9 +42,9 @@ class DQMEventInfo: public DQMEDAnalyzer{ protected: /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c); + void beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c) override; private: diff --git a/DQMServices/Components/src/DQMProvInfo.h b/DQMServices/Components/src/DQMProvInfo.h index 238abf03c1518..46fe3a0184190 100644 --- a/DQMServices/Components/src/DQMProvInfo.h +++ b/DQMServices/Components/src/DQMProvInfo.h @@ -28,13 +28,13 @@ class DQMProvInfo : public DQMEDAnalyzer { virtual ~DQMProvInfo(); protected: - void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) ; + void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override ; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void beginLuminosityBlock(const edm::LuminosityBlock& l, - const edm::EventSetup& c); - void analyze(const edm::Event& e, const edm::EventSetup& c); + const edm::EventSetup& c) override; + void analyze(const edm::Event& e, const edm::EventSetup& c) override; void endLuminosityBlock(const edm::LuminosityBlock& l, - const edm::EventSetup& c); + const edm::EventSetup& c) override; private: void bookHistogramsLhcInfo(DQMStore::IBooker &); diff --git a/DQMServices/Components/src/DQMScalInfo.h b/DQMServices/Components/src/DQMScalInfo.h index c4eaef2979d8e..ed0c1f4da846d 100755 --- a/DQMServices/Components/src/DQMScalInfo.h +++ b/DQMServices/Components/src/DQMScalInfo.h @@ -43,7 +43,7 @@ class DQMScalInfo: public DQMEDAnalyzer{ protected: /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQMServices/Components/test/DummyBookFillDQMStoreMultiThread.cc b/DQMServices/Components/test/DummyBookFillDQMStoreMultiThread.cc index a47303219cb76..048bfb9323072 100644 --- a/DQMServices/Components/test/DummyBookFillDQMStoreMultiThread.cc +++ b/DQMServices/Components/test/DummyBookFillDQMStoreMultiThread.cc @@ -147,14 +147,14 @@ class DummyBookFillDQMStoreMultiThread : public DQMEDAnalyzer { private: virtual void beginJob(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void endJob(); - virtual void endRun(edm::Run const&, edm::EventSetup const&); + virtual void endRun(edm::Run const&, edm::EventSetup const&) override; virtual void beginLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&); + edm::EventSetup const&) override; virtual void endLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&); + edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void fillerDispose(); diff --git a/DQMServices/Core/test/DQMTestMultiThread.cc b/DQMServices/Core/test/DQMTestMultiThread.cc index 0f402724aa24a..6662b3927b4f4 100644 --- a/DQMServices/Core/test/DQMTestMultiThread.cc +++ b/DQMServices/Core/test/DQMTestMultiThread.cc @@ -14,7 +14,7 @@ class DQMTestMultiThread public: explicit DQMTestMultiThread(const edm::ParameterSet&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker&, edm::Run const &, diff --git a/DQMServices/Examples/interface/DQMExample_Step1.h b/DQMServices/Examples/interface/DQMExample_Step1.h index 36906c56bdd09..9d5f169758fd8 100644 --- a/DQMServices/Examples/interface/DQMExample_Step1.h +++ b/DQMServices/Examples/interface/DQMExample_Step1.h @@ -56,10 +56,10 @@ class DQMExample_Step1: public DQMEDAnalyzer{ void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/DQMServices/Examples/interface/DQMExample_Step2.h b/DQMServices/Examples/interface/DQMExample_Step2.h index d750242ae8d9c..20fdadeebe86e 100644 --- a/DQMServices/Examples/interface/DQMExample_Step2.h +++ b/DQMServices/Examples/interface/DQMExample_Step2.h @@ -20,8 +20,8 @@ class DQMExample_Step2: public DQMEDHarvester{ protected: - void beginJob(); - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + void beginJob() override; + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&) override; //performed in the endLumi void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob private: diff --git a/DQMServices/FileIO/plugins/DQMFileSaverBase.h b/DQMServices/FileIO/plugins/DQMFileSaverBase.h index fbcaf77308916..9cb2da00d80c8 100644 --- a/DQMServices/FileIO/plugins/DQMFileSaverBase.h +++ b/DQMServices/FileIO/plugins/DQMFileSaverBase.h @@ -62,7 +62,7 @@ class DQMFileSaverBase virtual void globalEndRun(const edm::Run &, const edm::EventSetup &) const override final; virtual void postForkReacquireResources(unsigned int childIndex, - unsigned int numberOfChildren); + unsigned int numberOfChildren) override; // these method (and only these) should be overriden // so we need to call all file savers diff --git a/DataFormats/FWLite/src/MultiChainEvent.cc b/DataFormats/FWLite/src/MultiChainEvent.cc index 54d7bccf8e12b..cbb006553cf98 100644 --- a/DataFormats/FWLite/src/MultiChainEvent.cc +++ b/DataFormats/FWLite/src/MultiChainEvent.cc @@ -43,7 +43,7 @@ namespace fwlite { virtual void getThinnedProducts(edm::ProductID const& pid, std::vector& foundContainers, - std::vector& keys) const { + std::vector& keys) const override { event_->getThinnedProducts(pid, foundContainers, keys); } diff --git a/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.h b/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.h index 83588f4a2d4f9..9bb566a746ffe 100644 --- a/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.h +++ b/EventFilter/GctRawToDigi/src/GctFormatTranslateMCLegacy.h @@ -88,7 +88,7 @@ class GctFormatTranslateMCLegacy : public GctFormatTranslateBase virtual uint32_t generateRawHeader(const uint32_t blockId, const uint32_t nSamples, const uint32_t bxId, - const uint32_t eventId) const; + const uint32_t eventId) const override; private: diff --git a/EventFilter/HcalRawToDigi/plugins/HcalLaserEventFiltProducer2012.h b/EventFilter/HcalRawToDigi/plugins/HcalLaserEventFiltProducer2012.h index b03c870b2d36d..0542a309aa462 100644 --- a/EventFilter/HcalRawToDigi/plugins/HcalLaserEventFiltProducer2012.h +++ b/EventFilter/HcalRawToDigi/plugins/HcalLaserEventFiltProducer2012.h @@ -13,7 +13,7 @@ class HcalLaserEventFiltProducer2012 : public edm::EDProducer { virtual ~HcalLaserEventFiltProducer2012(){ delete hcalLaserEventFilter2012; } - virtual void produce(edm::Event&, const edm::EventSetup&); + virtual void produce(edm::Event&, const edm::EventSetup&) override; private: virtual void endJob() override; diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GtTriggerMenuLiteProducer.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GtTriggerMenuLiteProducer.h index 29a3992cd4083..60017e6c2631e 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GtTriggerMenuLiteProducer.h +++ b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GtTriggerMenuLiteProducer.h @@ -61,7 +61,7 @@ class L1GtTriggerMenuLiteProducer : public edm::one::EDProducer::setItem; - virtual void setItem(const FWEventItem* iItem); + virtual void setItem(const FWEventItem* iItem) override; REGISTER_PROXYBUILDER_METHODS(); diff --git a/Fireworks/FWInterface/interface/FWFFLooper.h b/Fireworks/FWInterface/interface/FWFFLooper.h index daee690c85ec0..33e58086f55be 100644 --- a/Fireworks/FWInterface/interface/FWFFLooper.h +++ b/Fireworks/FWInterface/interface/FWFFLooper.h @@ -53,7 +53,7 @@ class FWFFLooper : public CmsShowMainBase, public edm::EDLooperBase // ---------- member functions --------------------------- - virtual void attachTo(edm::ActivityRegistry &); + virtual void attachTo(edm::ActivityRegistry &) override; void postBeginJob(); void postEndJob(); @@ -64,13 +64,13 @@ class FWFFLooper : public CmsShowMainBase, public edm::EDLooperBase TEveMagField* getMagField(); void setupFieldForPropagator(TEveTrackPropagator* prop); - virtual void checkPosition(); - virtual void stopPlaying(); - virtual void autoLoadNewEvent(); + virtual void checkPosition() override; + virtual void stopPlaying() override ; + virtual void autoLoadNewEvent() override; void showPathsGUI(const TGWindow *p); - void quit(); + void quit() override; virtual void startingNewLoop(unsigned int) override; virtual edm::EDLooperBase::Status endOfLoop(const edm::EventSetup&, unsigned int) override; diff --git a/Fireworks/Muons/plugins/FWMuonProxyBuilder.cc b/Fireworks/Muons/plugins/FWMuonProxyBuilder.cc index 97aba9acbf786..30f6ba52ba440 100644 --- a/Fireworks/Muons/plugins/FWMuonProxyBuilder.cc +++ b/Fireworks/Muons/plugins/FWMuonProxyBuilder.cc @@ -23,7 +23,7 @@ class FWMuonProxyBuilder : public FWSimpleProxyBuilderTemplate FWMuonProxyBuilder( void ) {} virtual ~FWMuonProxyBuilder( void ) {} - virtual void setItem(const FWEventItem* iItem); + virtual void setItem(const FWEventItem* iItem) override; REGISTER_PROXYBUILDER_METHODS(); diff --git a/Fireworks/Muons/plugins/FWMuonRhoPhiProxyBuilder.cc b/Fireworks/Muons/plugins/FWMuonRhoPhiProxyBuilder.cc index c354498b60b02..4f32966bd114a 100644 --- a/Fireworks/Muons/plugins/FWMuonRhoPhiProxyBuilder.cc +++ b/Fireworks/Muons/plugins/FWMuonRhoPhiProxyBuilder.cc @@ -17,7 +17,7 @@ class FWMuonRhoPhiProxyBuilder : public FWSimpleProxyBuilderTemplate FWMuonRhoPhiProxyBuilder( void ) {} virtual ~FWMuonRhoPhiProxyBuilder( void ) {} - virtual void setItem(const FWEventItem* iItem); + virtual void setItem(const FWEventItem* iItem) override; REGISTER_PROXYBUILDER_METHODS(); diff --git a/Fireworks/Tracks/plugins/FWSiStripClusterProxyBuilder.cc b/Fireworks/Tracks/plugins/FWSiStripClusterProxyBuilder.cc index dee84a03c65b6..3d62e6b5de378 100644 --- a/Fireworks/Tracks/plugins/FWSiStripClusterProxyBuilder.cc +++ b/Fireworks/Tracks/plugins/FWSiStripClusterProxyBuilder.cc @@ -23,7 +23,7 @@ class FWSiStripClusterProxyBuilder : public FWProxyBuilderBase REGISTER_PROXYBUILDER_METHODS(); // virtual void cleanLocal(); - virtual void itemBeingDestroyed(const FWEventItem*); + virtual void itemBeingDestroyed(const FWEventItem*) override; protected: using FWProxyBuilderBase::build; diff --git a/Fireworks/Tracks/plugins/FWTrackProxyBuilder.cc b/Fireworks/Tracks/plugins/FWTrackProxyBuilder.cc index 83afd2493decb..e8e5977171998 100644 --- a/Fireworks/Tracks/plugins/FWTrackProxyBuilder.cc +++ b/Fireworks/Tracks/plugins/FWTrackProxyBuilder.cc @@ -31,7 +31,7 @@ class FWTrackProxyBuilder : public FWSimpleProxyBuilderTemplate { REGISTER_PROXYBUILDER_METHODS(); - virtual void setItem(const FWEventItem* iItem); + virtual void setItem(const FWEventItem* iItem) override; private: FWTrackProxyBuilder(const FWTrackProxyBuilder&); // stop default diff --git a/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h b/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h index 51281f738a37b..fee2236748f20 100644 --- a/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h +++ b/GeneratorInterface/Hydjet2Interface/interface/Hydjet2Hadronizer.h @@ -89,8 +89,8 @@ namespace gen void SetVolEff(double value) {fVolEff = value;} double GetVolEff() {return fVolEff;} - virtual bool RunDecays() {return (fDecay>0 ? kTRUE : kFALSE);} - virtual double GetWeakDecayLimit() {return fWeakDecay;} + virtual bool RunDecays() override {return (fDecay>0 ? kTRUE : kFALSE);} + virtual double GetWeakDecayLimit() override {return fWeakDecay;} bool IniOfThFreezeoutParameters(); diff --git a/GeneratorInterface/LHEInterface/plugins/LHESource.h b/GeneratorInterface/LHEInterface/plugins/LHESource.h index 7b1b05fc702db..af21dd5a03b2d 100644 --- a/GeneratorInterface/LHEInterface/plugins/LHESource.h +++ b/GeneratorInterface/LHEInterface/plugins/LHESource.h @@ -42,7 +42,7 @@ class LHERunInfoProduct; virtual void readRun_(edm::RunPrincipal& runPrincipal) override; virtual void readLuminosityBlock_(edm::LuminosityBlockPrincipal& lumiPrincipal) override; virtual void readEvent_(edm::EventPrincipal& eventPrincipal) override; - virtual void produce(edm::Event&) {} + virtual void produce(edm::Event&) override {} void nextEvent(); diff --git a/GeneratorInterface/PyquenInterface/interface/PyquenHadronizer.h b/GeneratorInterface/PyquenInterface/interface/PyquenHadronizer.h index a614f4565b055..089d0363522aa 100644 --- a/GeneratorInterface/PyquenInterface/interface/PyquenHadronizer.h +++ b/GeneratorInterface/PyquenInterface/interface/PyquenHadronizer.h @@ -43,7 +43,7 @@ namespace gen bool initializeForInternalPartons(); bool declareStableParticles( const std::vector& ); bool declareSpecialSettings( const std::vector& ) { return true; } - virtual bool select(HepMC::GenEvent* evtTry) const { return selector_->filter(evtTry); } + virtual bool select(HepMC::GenEvent* evtTry) const override { return selector_->filter(evtTry); } void finalizeEvent(); void statistics(); const char* classname() const; diff --git a/GeneratorInterface/Pythia8Interface/interface/MultiUserHook.h b/GeneratorInterface/Pythia8Interface/interface/MultiUserHook.h index 198c90d58325c..c1e7925902bcb 100644 --- a/GeneratorInterface/Pythia8Interface/interface/MultiUserHook.h +++ b/GeneratorInterface/Pythia8Interface/interface/MultiUserHook.h @@ -351,7 +351,7 @@ class MultiUserHook : public Pythia8::UserHooks { } // Possibility to veto an MPI. - bool canVetoMPIEmission() { + bool canVetoMPIEmission() override { bool test = false; for (Pythia8::UserHooks *hook : hooks_) { test |= hook->canVetoMPIEmission(); diff --git a/GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h b/GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h index 5719c3330300e..2f9e2a4ff27cb 100755 --- a/GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h +++ b/GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h @@ -54,7 +54,7 @@ class TauSpinnerCMS : public edm::one::EDProducer m_GMTInputToken; diff --git a/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h b/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h index 32df61752a384..3393b706d7076 100644 --- a/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h +++ b/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h @@ -43,10 +43,10 @@ class HLTBTagPerformanceAnalyzer : public DQMEDAnalyzer { public: explicit HLTBTagPerformanceAnalyzer(const edm::ParameterSet&); ~HLTBTagPerformanceAnalyzer(); - void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup); + void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override; private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun,edm::EventSetup const & iSetup ) override; struct JetRefCompare : diff --git a/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h b/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h index ec05474d9e033..b2b357444ccaf 100644 --- a/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h +++ b/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h @@ -34,10 +34,10 @@ class HLTVertexPerformanceAnalyzer : public DQMEDAnalyzer { public: explicit HLTVertexPerformanceAnalyzer(const edm::ParameterSet&); ~HLTVertexPerformanceAnalyzer(); - void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup); + void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override; private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; // variables from python configuration diff --git a/HLTriggerOffline/Egamma/interface/EmDQM.h b/HLTriggerOffline/Egamma/interface/EmDQM.h index d48053410d090..c5ab9c21492b2 100644 --- a/HLTriggerOffline/Egamma/interface/EmDQM.h +++ b/HLTriggerOffline/Egamma/interface/EmDQM.h @@ -75,13 +75,13 @@ class EmDQM : public DQMEDAnalyzer{ // Operations - void analyze(const edm::Event & event, const edm::EventSetup&); + void analyze(const edm::Event & event, const edm::EventSetup&) override; void beginJob(); void endJob(); - void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void endRun(edm::Run const&, edm::EventSetup const&); + void endRun(edm::Run const&, edm::EventSetup const&) override; private: // interface to DQM framework diff --git a/HLTriggerOffline/Egamma/interface/EmDQMReco.h b/HLTriggerOffline/Egamma/interface/EmDQMReco.h index b3c662801c864..fd9897feb0d68 100644 --- a/HLTriggerOffline/Egamma/interface/EmDQMReco.h +++ b/HLTriggerOffline/Egamma/interface/EmDQMReco.h @@ -91,10 +91,10 @@ class EmDQMReco : public DQMEDAnalyzer{ // Operations - void analyze(const edm::Event & event, const edm::EventSetup&); + void analyze(const edm::Event & event, const edm::EventSetup&) override; void beginJob(); void endJob(); - void dqmBeginRun( const edm::Run&, const edm::EventSetup& ); + void dqmBeginRun( const edm::Run&, const edm::EventSetup& ) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h b/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h index ae855578ed955..3d108924c43cc 100644 --- a/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h +++ b/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h @@ -48,10 +48,10 @@ class HLTExoticaValidator : public DQMEDAnalyzer { private: virtual void beginJob(); /// Method called by the framework just before dqmBeginRun() - virtual void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup & iSetup); + virtual void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup & iSetup) override; /// Method called for each event. - virtual void analyze(const edm::Event & iEvent, const edm::EventSetup & iSetup); - virtual void endRun(const edm::Run & iRun, const edm::EventSetup & iSetup); + virtual void analyze(const edm::Event & iEvent, const edm::EventSetup & iSetup) override; + virtual void endRun(const edm::Run & iRun, const edm::EventSetup & iSetup) override; virtual void endJob(); /// Copy (to be modified) of the input ParameterSet from configuration file. diff --git a/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc b/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc index e7cf821ab1608..4c6e61bc6592e 100755 --- a/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc +++ b/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc @@ -55,7 +55,7 @@ class HeavyFlavorValidation : public DQMEDAnalyzer { explicit HeavyFlavorValidation(const edm::ParameterSet&); ~HeavyFlavorValidation(); protected: - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h index 65836eeb49755..219f9b366f77b 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h @@ -45,10 +45,10 @@ class SUSY_HLT_DiJet_MET: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h index 0f278a1a6c880..4fe51d3ef59c9 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h @@ -41,10 +41,10 @@ class SUSY_HLT_DoubleEle_Hadronic: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h index 7449134af05f0..0e077eec177e0 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h @@ -38,10 +38,10 @@ class SUSY_HLT_DoubleMuon_Hadronic: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function @@ -77,4 +77,4 @@ class SUSY_HLT_DoubleMuon_Hadronic: public DQMEDAnalyzer{ }; -#endif \ No newline at end of file +#endif diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h index 48e7dc65f942d..5b9e86bf3cb06 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h @@ -45,10 +45,10 @@ class SUSY_HLT_ElecFakes: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h index e540b0d0f8dad..9aed9705f28f0 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h @@ -41,10 +41,10 @@ class SUSY_HLT_Electron_BJet: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h index 1e7bc594a2969..e35d2b74a8bac 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h @@ -34,10 +34,10 @@ class SUSY_HLT_InclusiveHT: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h index 65e776f362d53..c676be28a9da3 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h @@ -45,10 +45,10 @@ class SUSY_HLT_MuEle_Hadronic: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h index ab553981662cd..c81f999b322cb 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h @@ -45,10 +45,10 @@ class SUSY_HLT_MuonFakes: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h index 1c8e6ed87ce91..95e805dedfb56 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h @@ -38,10 +38,10 @@ class SUSY_HLT_Muon_BJet: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h index 873898f6830e4..43699192cef89 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h @@ -45,10 +45,10 @@ class SUSY_HLT_Muon_Hadronic: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h index 3f5ea68620cf0..b109c9218c093 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h @@ -36,10 +36,10 @@ class SUSY_HLT_PhotonHT: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h index ab33096e628de..bd0c4db120015 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h @@ -36,10 +36,10 @@ class SUSY_HLT_PhotonMET: public DQMEDAnalyzer protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h index e08ad962b1245..619e66292e97f 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h @@ -46,10 +46,10 @@ class SUSY_HLT_Razor: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h index a5e429918db19..d98cc8ce84caf 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h @@ -56,10 +56,10 @@ class SUSY_HLT_SingleLepton: public DQMEDAnalyzer{ protected: void dqmBeginRun(const edm::Run &run, const edm::EventSetup &e) override; void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) override; - void beginLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) ; - void analyze(const edm::Event &e, const edm::EventSetup &eSetup); - void endLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup); - void endRun(const edm::Run &run, const edm::EventSetup &eSetup); + void beginLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) override; + void analyze(const edm::Event &e, const edm::EventSetup &eSetup) override; + void endLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) override; + void endRun(const edm::Run &run, const edm::EventSetup &eSetup) override; private: //variables from config file diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h index 60006682f9173..eda88c9f6e134 100755 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h @@ -45,10 +45,10 @@ class SUSY_HLT_VBF_Mu: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h index e0d0a708bd79c..a8f31c01718ba 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h @@ -44,10 +44,10 @@ class SUSY_HLT_alphaT: public DQMEDAnalyzer{ protected: void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(edm::Event const& e, edm::EventSetup const& eSetup); - void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; + void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: //histos booking function diff --git a/IOMC/EventVertexGenerators/interface/BetafuncEvtVtxGenerator.h b/IOMC/EventVertexGenerators/interface/BetafuncEvtVtxGenerator.h index ff709c2f97358..d497938501547 100644 --- a/IOMC/EventVertexGenerators/interface/BetafuncEvtVtxGenerator.h +++ b/IOMC/EventVertexGenerators/interface/BetafuncEvtVtxGenerator.h @@ -37,9 +37,9 @@ class BetafuncEvtVtxGenerator : public BaseEvtVtxGenerator /// return a new event vertex //virtual CLHEP::Hep3Vector * newVertex(); - virtual HepMC::FourVector* newVertex(CLHEP::HepRandomEngine*) ; + virtual HepMC::FourVector* newVertex(CLHEP::HepRandomEngine*) override ; - virtual TMatrixD* GetInvLorentzBoost(); + virtual TMatrixD* GetInvLorentzBoost() override; /// set resolution in Z in cm diff --git a/IOMC/EventVertexGenerators/test/BoostTester.h b/IOMC/EventVertexGenerators/test/BoostTester.h index ce165adcdf3cd..13092b86f03d7 100644 --- a/IOMC/EventVertexGenerators/test/BoostTester.h +++ b/IOMC/EventVertexGenerators/test/BoostTester.h @@ -22,8 +22,8 @@ class BoostTester : public edm::EDAnalyzer virtual ~BoostTester() {} virtual void analyze( const edm::Event&, const edm::EventSetup&) override; - virtual void beginJob() ; - virtual void endJob() ; + virtual void beginJob() override ; + virtual void endJob() override ; private: diff --git a/IOMC/EventVertexGenerators/test/VtxTester.h b/IOMC/EventVertexGenerators/test/VtxTester.h index 4bdc234858d99..59272aad4d0c7 100644 --- a/IOMC/EventVertexGenerators/test/VtxTester.h +++ b/IOMC/EventVertexGenerators/test/VtxTester.h @@ -18,8 +18,8 @@ class VtxTester : public edm::EDAnalyzer virtual ~VtxTester() {} virtual void analyze( const edm::Event&, const edm::EventSetup&) override; - virtual void beginJob() ; - virtual void endJob() ; + virtual void beginJob() override ; + virtual void endJob() override ; private: diff --git a/IOMC/ParticleGuns/interface/FlatEGunASCIIWriter.h b/IOMC/ParticleGuns/interface/FlatEGunASCIIWriter.h index 54ec0b7150b53..020e25fa8dd2d 100644 --- a/IOMC/ParticleGuns/interface/FlatEGunASCIIWriter.h +++ b/IOMC/ParticleGuns/interface/FlatEGunASCIIWriter.h @@ -44,7 +44,7 @@ namespace edm virtual ~FlatEGunASCIIWriter() ; virtual void analyze( const edm::Event&, const edm::EventSetup&) override; - virtual void beginJob() ; + virtual void beginJob() override ; virtual void beginRun(const edm::Run&, const EventSetup&) override; private: diff --git a/IOPool/Streamer/interface/StreamerInputModule.h b/IOPool/Streamer/interface/StreamerInputModule.h index 3eacdd88a7822..aae6f18daff88 100644 --- a/IOPool/Streamer/interface/StreamerInputModule.h +++ b/IOPool/Streamer/interface/StreamerInputModule.h @@ -33,7 +33,7 @@ namespace edm if(pr_.get() != nullptr) pr_->closeFile(); } - virtual bool checkNextEvent(); + virtual bool checkNextEvent() override; //ProductRegistry const* prod_reg_; edm::propagate_const> pr_; diff --git a/L1Trigger/DTTrigger/interface/DTTrigProd.h b/L1Trigger/DTTrigger/interface/DTTrigProd.h index 52e471ad9563b..030a60a5d6422 100644 --- a/L1Trigger/DTTrigger/interface/DTTrigProd.h +++ b/L1Trigger/DTTrigger/interface/DTTrigProd.h @@ -38,7 +38,7 @@ class DTTrigProd: public edm::EDProducer{ void beginRun(edm::Run const& iRun, const edm::EventSetup& iEventSetup) override; //! Producer: process every event and generates trigger data - void produce(edm::Event & iEvent, const edm::EventSetup& iEventSetup); + void produce(edm::Event & iEvent, const edm::EventSetup& iEventSetup) override; private: diff --git a/L1Trigger/HardwareValidation/interface/L1Comparator.h b/L1Trigger/HardwareValidation/interface/L1Comparator.h index 79fde91518437..22542f85788df 100644 --- a/L1Trigger/HardwareValidation/interface/L1Comparator.h +++ b/L1Trigger/HardwareValidation/interface/L1Comparator.h @@ -47,10 +47,10 @@ class L1Comparator : public edm::EDProducer { private: - virtual void beginJob(void); + virtual void beginJob(void) override; virtual void beginRun(edm::Run const&, const edm::EventSetup&) override final; - virtual void produce (edm::Event&, const edm::EventSetup&); - virtual void endJob(); + virtual void produce (edm::Event&, const edm::EventSetup&) override; + virtual void endJob() override; template void process( T const*, T const*, const int, const int); diff --git a/L1Trigger/RPCTechnicalTrigger/interface/RPCTechnicalTrigger.h b/L1Trigger/RPCTechnicalTrigger/interface/RPCTechnicalTrigger.h index 1569d65ffb770..3fba4d5a53fb7 100644 --- a/L1Trigger/RPCTechnicalTrigger/interface/RPCTechnicalTrigger.h +++ b/L1Trigger/RPCTechnicalTrigger/interface/RPCTechnicalTrigger.h @@ -75,8 +75,8 @@ class RPCTechnicalTrigger : public edm::EDProducer { //virtual void beginJob() ; virtual void beginRun(edm::Run const&, const edm::EventSetup&) override final; - virtual void produce(edm::Event&, const edm::EventSetup&); - virtual void endJob(); + virtual void produce(edm::Event&, const edm::EventSetup&) override; + virtual void endJob() override; //........................................................................... diff --git a/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryFilter.h b/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryFilter.h index 3f7858f8017ae..6654ae31281e3 100644 --- a/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryFilter.h +++ b/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryFilter.h @@ -83,7 +83,7 @@ class FlavorHistoryFilter : public edm::EDFilter { private: virtual bool filter(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; // ----------member data --------------------------- edm::EDGetTokenT bsrcToken_; // Input b flavor history collection name diff --git a/PhysicsTools/HepMCCandAlgos/interface/HFFilter.h b/PhysicsTools/HepMCCandAlgos/interface/HFFilter.h index 02d5c91199e17..6bad32e5a1171 100644 --- a/PhysicsTools/HepMCCandAlgos/interface/HFFilter.h +++ b/PhysicsTools/HepMCCandAlgos/interface/HFFilter.h @@ -48,7 +48,7 @@ class HFFilter : public edm::EDFilter { ~HFFilter(); virtual bool filter(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; private: // ----------member data --------------------------- diff --git a/PhysicsTools/HepMCCandAlgos/interface/ModelFilter.h b/PhysicsTools/HepMCCandAlgos/interface/ModelFilter.h index 2d1c5db8abce7..fd79ab1846a6f 100644 --- a/PhysicsTools/HepMCCandAlgos/interface/ModelFilter.h +++ b/PhysicsTools/HepMCCandAlgos/interface/ModelFilter.h @@ -30,9 +30,9 @@ namespace edm { typedef std::vector::const_iterator comments_const_iterator; private: - virtual void beginJob() ; + virtual void beginJob() override ; virtual bool filter(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; edm::EDGetTokenT tokenSource_; std::string modelTag_; diff --git a/PhysicsTools/HepMCCandAlgos/test/HZZ4muAnalyzer.h b/PhysicsTools/HepMCCandAlgos/test/HZZ4muAnalyzer.h index 9b6d295a64fc9..ab45f11a3e655 100644 --- a/PhysicsTools/HepMCCandAlgos/test/HZZ4muAnalyzer.h +++ b/PhysicsTools/HepMCCandAlgos/test/HZZ4muAnalyzer.h @@ -20,8 +20,8 @@ class HZZ4muAnalyzer : public edm::EDAnalyzer // as it'll be deleted upon closing TFile virtual void analyze( const edm::Event&, const edm::EventSetup&) override; - virtual void beginJob() ; - virtual void endJob() ; + virtual void beginJob() override ; + virtual void endJob() override ; private: diff --git a/PhysicsTools/PatAlgos/plugins/PATJetSlimmer.cc b/PhysicsTools/PatAlgos/plugins/PATJetSlimmer.cc index d8f505dec2f92..fa84c2491b937 100644 --- a/PhysicsTools/PatAlgos/plugins/PATJetSlimmer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATJetSlimmer.cc @@ -28,7 +28,7 @@ namespace pat { explicit PATJetSlimmer(const edm::ParameterSet & iConfig); virtual ~PATJetSlimmer() { } - virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup); + virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup) override; virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override final; private: diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonSlimmer.cc b/PhysicsTools/PatAlgos/plugins/PATMuonSlimmer.cc index 36d170829d1d2..055fb80a8048f 100644 --- a/PhysicsTools/PatAlgos/plugins/PATMuonSlimmer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATMuonSlimmer.cc @@ -27,7 +27,7 @@ namespace pat { explicit PATMuonSlimmer(const edm::ParameterSet & iConfig); virtual ~PATMuonSlimmer() { } - virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup); + virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup) override; virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override final; private: diff --git a/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc b/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc index 2584165e3fe41..044c463b56873 100644 --- a/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATPhotonSlimmer.cc @@ -30,7 +30,7 @@ namespace pat { explicit PATPhotonSlimmer(const edm::ParameterSet & iConfig); virtual ~PATPhotonSlimmer() { } - virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup); + virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup) override; virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override final; private: diff --git a/PhysicsTools/PatAlgos/plugins/PATTauSlimmer.cc b/PhysicsTools/PatAlgos/plugins/PATTauSlimmer.cc index 2d75398d16517..b28336b98d8d6 100644 --- a/PhysicsTools/PatAlgos/plugins/PATTauSlimmer.cc +++ b/PhysicsTools/PatAlgos/plugins/PATTauSlimmer.cc @@ -22,7 +22,7 @@ namespace pat { explicit PATTauSlimmer(const edm::ParameterSet & iConfig); virtual ~PATTauSlimmer() { } - virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup); + virtual void produce(edm::Event & iEvent, const edm::EventSetup & iSetup) override; virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override final; private: diff --git a/PhysicsTools/TagAndProbe/interface/ElectronMatchedCandidateProducer.h b/PhysicsTools/TagAndProbe/interface/ElectronMatchedCandidateProducer.h index 3aab77176f815..dd43c695fb238 100644 --- a/PhysicsTools/TagAndProbe/interface/ElectronMatchedCandidateProducer.h +++ b/PhysicsTools/TagAndProbe/interface/ElectronMatchedCandidateProducer.h @@ -22,9 +22,9 @@ class ElectronMatchedCandidateProducer : public edm::EDProducer ~ElectronMatchedCandidateProducer(); private: - virtual void beginJob() ; + virtual void beginJob() override ; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data --------------------------- diff --git a/PhysicsTools/TagAndProbe/interface/TriggerCandProducer.h b/PhysicsTools/TagAndProbe/interface/TriggerCandProducer.h index 36bd0340dfdb4..d2780a544f3ea 100644 --- a/PhysicsTools/TagAndProbe/interface/TriggerCandProducer.h +++ b/PhysicsTools/TagAndProbe/interface/TriggerCandProducer.h @@ -29,9 +29,9 @@ class TriggerCandProducer : public edm::EDProducer private: virtual void beginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override; - virtual void beginJob() ; + virtual void beginJob() override; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data -------------------------- diff --git a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h index b9f585ba8fdc9..b02e17688c32b 100644 --- a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h +++ b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdCollectionProducer.h @@ -50,7 +50,7 @@ class InterestingDetIdCollectionProducer : public edm::stream::EDProducer<> { explicit InterestingDetIdCollectionProducer(const edm::ParameterSet&); virtual void beginRun (edm::Run const&, const edm::EventSetup&) override final; //! producer - virtual void produce(edm::Event &, const edm::EventSetup&); + virtual void produce(edm::Event &, const edm::EventSetup&) override; private: // ----------member data --------------------------- diff --git a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h index 09f0aa0e80323..39d25fe66f9c4 100644 --- a/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h +++ b/RecoEcal/EgammaClusterProducers/interface/InterestingDetIdFromSuperClusterProducer.h @@ -50,7 +50,7 @@ class InterestingDetIdFromSuperClusterProducer : public edm::stream::EDProducer< explicit InterestingDetIdFromSuperClusterProducer(const edm::ParameterSet&); virtual void beginRun (edm::Run const&, const edm::EventSetup&) override final; //! producer - virtual void produce(edm::Event &, const edm::EventSetup&); + virtual void produce(edm::Event &, const edm::EventSetup&) override; private: // ----------member data --------------------------- diff --git a/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h b/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h index a569d420dcb35..36491ba5d6d9b 100644 --- a/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h +++ b/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h @@ -28,7 +28,7 @@ class ReducedESRecHitCollectionProducer : public edm::stream::EDProducer<> { ReducedESRecHitCollectionProducer(const edm::ParameterSet& pset); virtual ~ReducedESRecHitCollectionProducer(); virtual void beginRun (edm::Run const&, const edm::EventSetup&) override final; - void produce(edm::Event & e, const edm::EventSetup& c); + void produce(edm::Event & e, const edm::EventSetup& c) override; void collectIds(const ESDetId strip1, const ESDetId strip2, const int & row=0); private : diff --git a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronFull5x5Filler.h b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronFull5x5Filler.h index 27a588c7d84f1..16f524a99ad6b 100644 --- a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronFull5x5Filler.h +++ b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronFull5x5Filler.h @@ -18,7 +18,7 @@ class GsfElectronFull5x5Filler : public edm::stream::EDProducer<> explicit GsfElectronFull5x5Filler( const edm::ParameterSet & ) ; virtual ~GsfElectronFull5x5Filler() ; - virtual void produce( edm::Event &, const edm::EventSetup & ) ; + virtual void produce( edm::Event &, const edm::EventSetup & ) override ; void calculateShowerShape_full5x5(const reco::SuperClusterRef & theClus, bool pflow, reco::GsfElectron::ShowerShape & showerShape); void beginLuminosityBlock(edm::LuminosityBlock const&, diff --git a/RecoEgamma/EgammaHFProducers/plugins/HFEMClusterProducer.h b/RecoEgamma/EgammaHFProducers/plugins/HFEMClusterProducer.h index 6922652f0a704..d3318b8eea287 100644 --- a/RecoEgamma/EgammaHFProducers/plugins/HFEMClusterProducer.h +++ b/RecoEgamma/EgammaHFProducers/plugins/HFEMClusterProducer.h @@ -15,7 +15,7 @@ class HFEMClusterProducer : public edm::stream::EDProducer<> { public: explicit HFEMClusterProducer(edm::ParameterSet const& conf); - virtual void produce(edm::Event& e, edm::EventSetup const& iSetup); + virtual void produce(edm::Event& e, edm::EventSetup const& iSetup) override; virtual void beginRun(edm::Run const &, edm::EventSetup const&) override final { algo_.resetForRun(); } private: edm::EDGetToken hfreco_; diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoESDetIdCollectionProducer.h b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoESDetIdCollectionProducer.h index 288bb0c185a54..49858bfb98468 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoESDetIdCollectionProducer.h +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoESDetIdCollectionProducer.h @@ -45,7 +45,7 @@ class EgammaIsoESDetIdCollectionProducer : public edm::stream::EDProducer<> { explicit EgammaIsoESDetIdCollectionProducer(const edm::ParameterSet&); virtual void beginRun (edm::Run const&, const edm::EventSetup&) override final; //! producer - virtual void produce(edm::Event &, const edm::EventSetup&); + virtual void produce(edm::Event &, const edm::EventSetup&) override; private: void addDetIds(const reco::SuperCluster& superClus,reco::PFClusterCollection clusters,const reco::PFCluster::EEtoPSAssociation& eeClusToESMap,std::vector& detIdsToStore); diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoHcalDetIdCollectionProducer.h b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoHcalDetIdCollectionProducer.h index ee0333a89ebd4..17f6c9535b2a9 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoHcalDetIdCollectionProducer.h +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/EgammaIsoHcalDetIdCollectionProducer.h @@ -47,7 +47,7 @@ class EgammaIsoHcalDetIdCollectionProducer : public edm::stream::EDProducer<> { explicit EgammaIsoHcalDetIdCollectionProducer(const edm::ParameterSet&); virtual void beginRun (edm::Run const&, const edm::EventSetup&) override final; //! producer - virtual void produce(edm::Event &, const edm::EventSetup&); + virtual void produce(edm::Event &, const edm::EventSetup&) override; private: void addDetIds(const reco::SuperCluster& superClus,const HBHERecHitCollection& recHits,std::vector& detIdsToStore); diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/ParticleBasedIsoProducer.h b/RecoEgamma/EgammaIsolationAlgos/plugins/ParticleBasedIsoProducer.h index 3bd5e58a1b54d..91c3374c43746 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/ParticleBasedIsoProducer.h +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/ParticleBasedIsoProducer.h @@ -24,7 +24,7 @@ class ParticleBasedIsoProducer : public edm::stream::EDProducer<> virtual void beginRun (edm::Run const& r, edm::EventSetup const & es) override; virtual void endRun(edm::Run const&, edm::EventSetup const&) override; - virtual void produce(edm::Event& e, const edm::EventSetup& c); + virtual void produce(edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithConeVeto.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithConeVeto.cc index d9d8ed4644a29..9136a1f317d76 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithConeVeto.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithConeVeto.cc @@ -55,7 +55,7 @@ class ElectronPFIsolationWithConeVeto : public citk::IsolationConeDefinitionBase ElectronPFIsolationWithConeVeto(const ElectronPFIsolationWithConeVeto&) = delete; ElectronPFIsolationWithConeVeto& operator=(const ElectronPFIsolationWithConeVeto&) =delete; - void setConsumes(edm::ConsumesCollector) {} + void setConsumes(edm::ConsumesCollector) override {} bool isInIsolationCone(const reco::CandidatePtr& physob, const reco::CandidatePtr& other) const override final; diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithMapBasedVeto.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithMapBasedVeto.cc index 78c5ba17cf089..89c403b1e7c1d 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithMapBasedVeto.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/ElectronPFIsolationWithMapBasedVeto.cc @@ -84,14 +84,14 @@ class ElectronPFIsolationWithMapBasedVeto : public citk::IsolationConeDefinition edm::Handle< edm::ValueMap > > particleBasedIsolationMap; edm::EDGetTokenT > > particleBasedIsolationToken_; - virtual void getEventInfo(const edm::Event& iEvent) + virtual void getEventInfo(const edm::Event& iEvent) override { iEvent.getByToken(particleBasedIsolationToken_, particleBasedIsolationMap); }; //As far as I understand now, the object particleBasedIsolationMap should be fixed, so we don't configure the name - void setConsumes(edm::ConsumesCollector iC) + void setConsumes(edm::ConsumesCollector iC) override { particleBasedIsolationToken_ = iC.mayConsume > >(edm::InputTag("particleBasedIsolation", "gedGsfElectrons")); } diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithConeVeto.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithConeVeto.cc index 3c28162310d96..203d915460052 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithConeVeto.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithConeVeto.cc @@ -56,7 +56,7 @@ class PhotonPFIsolationWithConeVeto : public citk::IsolationConeDefinitionBase { PhotonPFIsolationWithConeVeto(const PhotonPFIsolationWithConeVeto&) = delete; PhotonPFIsolationWithConeVeto& operator=(const PhotonPFIsolationWithConeVeto&) =delete; - void setConsumes(edm::ConsumesCollector) {} + void setConsumes(edm::ConsumesCollector) override {} bool isInIsolationCone(const reco::CandidatePtr& photon, const reco::CandidatePtr& pfCandidate) const override final; diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithMapBasedVeto.cc b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithMapBasedVeto.cc index 0f2ba8e691384..ccb0948dbd790 100644 --- a/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithMapBasedVeto.cc +++ b/RecoEgamma/EgammaIsolationAlgos/plugins/isolation_cones/PhotonPFIsolationWithMapBasedVeto.cc @@ -86,14 +86,14 @@ class PhotonPFIsolationWithMapBasedVeto : public citk::IsolationConeDefinitionBa edm::Handle< edm::ValueMap > > particleBasedIsolationMap; edm::EDGetTokenT > > particleBasedIsolationToken_; - virtual void getEventInfo(const edm::Event& iEvent) + virtual void getEventInfo(const edm::Event& iEvent) override { iEvent.getByToken(particleBasedIsolationToken_, particleBasedIsolationMap); }; //As far as I understand now, the object particleBasedIsolationMap should be fixed, so we don't configure the name - void setConsumes(edm::ConsumesCollector iC) + void setConsumes(edm::ConsumesCollector iC) override { particleBasedIsolationToken_ = iC.mayConsume > >(_particleBasedIsolation); } diff --git a/RecoEgamma/EgammaPhotonProducers/interface/ConvertedPhotonProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/ConvertedPhotonProducer.h index 10e165e650119..d1364fcfc28cf 100644 --- a/RecoEgamma/EgammaPhotonProducers/interface/ConvertedPhotonProducer.h +++ b/RecoEgamma/EgammaPhotonProducers/interface/ConvertedPhotonProducer.h @@ -39,7 +39,7 @@ class ConvertedPhotonProducer : public edm::stream::EDProducer<> { virtual ~ConvertedPhotonProducer(); virtual void beginRun(edm::Run const&, const edm::EventSetup &es) override final; - virtual void produce(edm::Event& evt, const edm::EventSetup& es); + virtual void produce(edm::Event& evt, const edm::EventSetup& es) override; private: diff --git a/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h index 742b8d3b43ff5..368f2bc8fc283 100644 --- a/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h +++ b/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h @@ -48,7 +48,7 @@ class GEDPhotonProducer : public edm::stream::EDProducer<> { virtual void beginRun (edm::Run const& r, edm::EventSetup const & es) override final; virtual void endRun(edm::Run const&, edm::EventSetup const&) override final; - virtual void produce(edm::Event& evt, const edm::EventSetup& es); + virtual void produce(edm::Event& evt, const edm::EventSetup& es) override; private: diff --git a/RecoEgamma/EgammaPhotonProducers/interface/PhotonProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/PhotonProducer.h index 32bdbf9f922b2..51246274ea264 100644 --- a/RecoEgamma/EgammaPhotonProducers/interface/PhotonProducer.h +++ b/RecoEgamma/EgammaPhotonProducers/interface/PhotonProducer.h @@ -43,7 +43,7 @@ class PhotonProducer : public edm::stream::EDProducer<> { virtual void beginRun (edm::Run const& r, edm::EventSetup const & es) override final; virtual void endRun(edm::Run const&, edm::EventSetup const&) override final; - virtual void produce(edm::Event& evt, const edm::EventSetup& es); + virtual void produce(edm::Event& evt, const edm::EventSetup& es) override; private: diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronMVAEstimatorRun2Phys14NonTrig.h b/RecoEgamma/ElectronIdentification/plugins/ElectronMVAEstimatorRun2Phys14NonTrig.h index 25bf3b677a612..8446f6d1de6cd 100644 --- a/RecoEgamma/ElectronIdentification/plugins/ElectronMVAEstimatorRun2Phys14NonTrig.h +++ b/RecoEgamma/ElectronIdentification/plugins/ElectronMVAEstimatorRun2Phys14NonTrig.h @@ -70,7 +70,7 @@ class ElectronMVAEstimatorRun2Phys14NonTrig : public AnyMVAEstimatorRun2Base{ ~ElectronMVAEstimatorRun2Phys14NonTrig(); // Calculation of the MVA value - float mvaValue( const edm::Ptr& particle, const edm::Event& evt) const; + float mvaValue( const edm::Ptr& particle, const edm::Event& evt) const override; // Utility functions std::unique_ptr createSingleReader(const int iCategory, const edm::FileInPath &weightFile) ; @@ -82,8 +82,8 @@ class ElectronMVAEstimatorRun2Phys14NonTrig : public AnyMVAEstimatorRun2Base{ // Functions that should work on both pat and reco electrons // (use the fact that pat::Electron inherits from reco::GsfElectron) - std::vector fillMVAVariables(const edm::Ptr& particle, const edm::Event&) const; - int findCategory(const edm::Ptr& particle) const; + std::vector fillMVAVariables(const edm::Ptr& particle, const edm::Event&) const override; + int findCategory(const edm::Ptr& particle) const override; // The function below ensures that the variables passed to MVA are // within reasonable bounds void constrainMVAVariables(AllVariables& vars) const; diff --git a/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Phys14NonTrig.h b/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Phys14NonTrig.h index 1a5da98da473e..d106db0852d7a 100644 --- a/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Phys14NonTrig.h +++ b/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Phys14NonTrig.h @@ -63,7 +63,7 @@ class PhotonMVAEstimatorRun2Phys14NonTrig : public AnyMVAEstimatorRun2Base { ~PhotonMVAEstimatorRun2Phys14NonTrig(); // Calculation of the MVA value - float mvaValue(const edm::Ptr& particle, const edm::Event&) const; + float mvaValue(const edm::Ptr& particle, const edm::Event&) const override; // Utility functions std::unique_ptr createSingleReader(const int iCategory, const edm::FileInPath &weightFile) ; @@ -76,7 +76,7 @@ class PhotonMVAEstimatorRun2Phys14NonTrig : public AnyMVAEstimatorRun2Base { // Functions that should work on both pat and reco electrons // (use the fact that pat::Electron inherits from reco::GsfElectron) std::vector fillMVAVariables(const edm::Ptr& particle, const edm::Event&) const override; - int findCategory(const edm::Ptr& particle) const; + int findCategory(const edm::Ptr& particle) const override; // The function below ensures that the variables passed to MVA are // within reasonable bounds void constrainMVAVariables(AllVariables& vars) const; diff --git a/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Spring15NonTrig.h b/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Spring15NonTrig.h index bfa8b38d0d215..0553dd1332d16 100644 --- a/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Spring15NonTrig.h +++ b/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimatorRun2Spring15NonTrig.h @@ -63,12 +63,12 @@ class PhotonMVAEstimatorRun2Spring15NonTrig : public AnyMVAEstimatorRun2Base{ ~PhotonMVAEstimatorRun2Spring15NonTrig(); // Calculation of the MVA value - float mvaValue( const edm::Ptr& particle, const edm::Event&) const; + float mvaValue( const edm::Ptr& particle, const edm::Event&) const override; // Utility functions std::unique_ptr createSingleReader(const int iCategory, const edm::FileInPath &weightFile); - virtual int getNCategories() const { return nCategories; } + virtual int getNCategories() const override { return nCategories; } bool isEndcapCategory( int category ) const; virtual const std::string& getName() const override final { return _name; } virtual const std::string& getTag() const override final { return _tag; } diff --git a/RecoHI/HiTracking/interface/HIPixelTrackFilter.h b/RecoHI/HiTracking/interface/HIPixelTrackFilter.h index 9e6c833ae323f..735bbfa103ec8 100644 --- a/RecoHI/HiTracking/interface/HIPixelTrackFilter.h +++ b/RecoHI/HiTracking/interface/HIPixelTrackFilter.h @@ -15,7 +15,7 @@ class HIPixelTrackFilter : public ClusterShapeTrackFilter { HIPixelTrackFilter(const edm::ParameterSet& ps, edm::ConsumesCollector& iC); virtual ~HIPixelTrackFilter(); virtual bool operator() (const reco::Track*, const PixelTrackFilter::Hits & hits, - const TrackerTopology *tTopo) const; + const TrackerTopology *tTopo) const override; virtual void update(const edm::Event& ev, const edm::EventSetup& es) override; private: double theTIPMax, theNSigmaTipMaxTolerance; diff --git a/RecoHI/HiTracking/interface/HIProtoTrackFilter.h b/RecoHI/HiTracking/interface/HIProtoTrackFilter.h index 526c34344aaca..90e5c13db1948 100644 --- a/RecoHI/HiTracking/interface/HIProtoTrackFilter.h +++ b/RecoHI/HiTracking/interface/HIProtoTrackFilter.h @@ -14,7 +14,7 @@ class HIProtoTrackFilter : public PixelTrackFilter { public: HIProtoTrackFilter(const edm::ParameterSet& ps, edm::ConsumesCollector& iC); virtual ~HIProtoTrackFilter(); - virtual bool operator() (const reco::Track*, const PixelTrackFilter::Hits & hits) const; + virtual bool operator() (const reco::Track*, const PixelTrackFilter::Hits & hits) const override; virtual void update(const edm::Event& ev, const edm::EventSetup& es) override; private: double theTIPMax; diff --git a/RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.h b/RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.h index 5eb03b72b9e1a..27f7f48b073b2 100644 --- a/RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.h +++ b/RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.h @@ -17,7 +17,7 @@ class HIPixelMedianVtxProducer : public edm::one::EDProducer<> virtual void produce(edm::Event& ev, const edm::EventSetup& es) override; private: - void beginJob(){}; + void beginJob() override{}; edm::EDGetTokenT theTrackCollection; double thePtMin; diff --git a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.h b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.h index 41382cf8d2ae4..de9565631e411 100644 --- a/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.h +++ b/RecoLocalCalo/EcalRecProducers/plugins/EcalUncalibRecHitWorkerMultiFit.h @@ -48,7 +48,7 @@ class EcalUncalibRecHitWorkerMultiFit final : public EcalUncalibRecHitWorkerBase void set(const edm::Event& evt) override; bool run(const edm::Event& evt, const EcalDigiCollection::const_iterator & digi, EcalUncalibratedRecHitCollection & result) override; public: - edm::ParameterSetDescription getAlgoDescription(); + edm::ParameterSetDescription getAlgoDescription() override; private: edm::ESHandle peds; diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitWorkerWeights.h b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitWorkerWeights.h index 948b0f0ea53bc..faa011a7cbd8f 100644 --- a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitWorkerWeights.h +++ b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalUncalibRecHitWorkerWeights.h @@ -30,7 +30,7 @@ class HGCalUncalibRecHitWorkerWeights : public HGCalUncalibRecHitWorkerBaseClass HGCalUncalibRecHitWorkerWeights(const edm::ParameterSet&); virtual ~HGCalUncalibRecHitWorkerWeights() {}; - void set(const edm::EventSetup& es); + void set(const edm::EventSetup& es) override; bool run1(const edm::Event& evt, const HGCEEDigiCollection::const_iterator & digi, HGCeeUncalibratedRecHitCollection & result) override; bool run2(const edm::Event& evt, const HGCHEDigiCollection::const_iterator & digi, HGChefUncalibratedRecHitCollection & result) override; bool run3(const edm::Event& evt, const HGCBHDigiCollection::const_iterator & digi, HGChebUncalibratedRecHitCollection & result) override; diff --git a/RecoLocalCalo/HcalRecProducers/src/ZdcSimpleReconstructor.h b/RecoLocalCalo/HcalRecProducers/src/ZdcSimpleReconstructor.h index c5d975961c95b..0d0c762bb2e3f 100644 --- a/RecoLocalCalo/HcalRecProducers/src/ZdcSimpleReconstructor.h +++ b/RecoLocalCalo/HcalRecProducers/src/ZdcSimpleReconstructor.h @@ -26,7 +26,7 @@ virtual ~ZdcSimpleReconstructor(); virtual void beginRun(edm::Run const&r, edm::EventSetup const & es) override final; virtual void endRun(edm::Run const&r, edm::EventSetup const & es) override final; - virtual void produce(edm::Event& e, const edm::EventSetup& c); + virtual void produce(edm::Event& e, const edm::EventSetup& c) override; private: ZdcSimpleRecAlgo reco_; DetId::Detector det_; diff --git a/RecoLocalTracker/SiStripClusterizer/interface/ThreeThresholdAlgorithm.h b/RecoLocalTracker/SiStripClusterizer/interface/ThreeThresholdAlgorithm.h index dae7ca6c39158..279b67fd68f7b 100644 --- a/RecoLocalTracker/SiStripClusterizer/interface/ThreeThresholdAlgorithm.h +++ b/RecoLocalTracker/SiStripClusterizer/interface/ThreeThresholdAlgorithm.h @@ -14,7 +14,7 @@ class ThreeThresholdAlgorithm final : public StripClusterizerAlgorithm { void clusterizeDetUnit(const edm::DetSet &, output_t::TSFastFiller &) const override; void clusterizeDetUnit(const edmNew::DetSet &, output_t::TSFastFiller &) const override; - Det stripByStripBegin(uint32_t id) const; + Det stripByStripBegin(uint32_t id) const override; // LazyGetter interface void stripByStripAdd(State & state, uint16_t strip, uint8_t adc, std::vector& out) const override; diff --git a/RecoLocalTracker/SiStripRecHitConverter/interface/StripCPE.h b/RecoLocalTracker/SiStripRecHitConverter/interface/StripCPE.h index e399831faf941..f41f789518420 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/interface/StripCPE.h +++ b/RecoLocalTracker/SiStripRecHitConverter/interface/StripCPE.h @@ -27,7 +27,7 @@ class StripCPE : public StripClusterParameterEstimator const SiStripBackPlaneCorrection&, const SiStripConfObject&, const SiStripLatency&); - LocalVector driftDirection(const StripGeomDetUnit* det) const; + LocalVector driftDirection(const StripGeomDetUnit* det) const override; struct Param { Param() : topology(nullptr) {} diff --git a/RecoMuon/CosmicMuonProducer/interface/CosmicMuonSmoother.h b/RecoMuon/CosmicMuonProducer/interface/CosmicMuonSmoother.h index 3732abbd5ee47..40c4a65ca234f 100644 --- a/RecoMuon/CosmicMuonProducer/interface/CosmicMuonSmoother.h +++ b/RecoMuon/CosmicMuonProducer/interface/CosmicMuonSmoother.h @@ -71,7 +71,7 @@ class CosmicMuonSmoother : public TrajectorySmoother { const TrajectoryStateOnSurface& firstPredTsos) const; - virtual void setHitCloner(TkCloner const * hc) {} + virtual void setHitCloner(TkCloner const * hc) override {} private: std::vector smooth(const std::vector& ) const; diff --git a/RecoMuon/L3TrackFinder/interface/MuonCkfTrajectoryBuilder.h b/RecoMuon/L3TrackFinder/interface/MuonCkfTrajectoryBuilder.h index e6441e82b9db5..50774f0923550 100644 --- a/RecoMuon/L3TrackFinder/interface/MuonCkfTrajectoryBuilder.h +++ b/RecoMuon/L3TrackFinder/interface/MuonCkfTrajectoryBuilder.h @@ -14,7 +14,7 @@ class MuonCkfTrajectoryBuilder : public CkfTrajectoryBuilder { void collectMeasurement(const DetLayer * layer, const std::vector& nl,const TrajectoryStateOnSurface & currentState, std::vector& result,int& invalidHits,const Propagator *) const; - virtual void findCompatibleMeasurements(const TrajectorySeed&seed, const TempTrajectory& traj, std::vector & result) const; + virtual void findCompatibleMeasurements(const TrajectorySeed&seed, const TempTrajectory& traj, std::vector & result) const override; //and other fields bool theUseSeedLayer; diff --git a/RecoMuon/MuonIsolation/plugins/MuonPFIsolationWithConeVeto.cc b/RecoMuon/MuonIsolation/plugins/MuonPFIsolationWithConeVeto.cc index a8e2f6f5238f4..754d1e604933d 100644 --- a/RecoMuon/MuonIsolation/plugins/MuonPFIsolationWithConeVeto.cc +++ b/RecoMuon/MuonIsolation/plugins/MuonPFIsolationWithConeVeto.cc @@ -25,7 +25,7 @@ class MuonPFIsolationWithConeVeto : public citk::IsolationConeDefinitionBase { MuonPFIsolationWithConeVeto(const MuonPFIsolationWithConeVeto&) = delete; MuonPFIsolationWithConeVeto& operator=(const MuonPFIsolationWithConeVeto&) =delete; - void setConsumes(edm::ConsumesCollector) {} + void setConsumes(edm::ConsumesCollector) override {} bool isInIsolationCone(const reco::CandidatePtr& physob, const reco::CandidatePtr& other) const override final; diff --git a/RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.h b/RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.h index 5314e1f7c0e4b..5138e951f74c0 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.h +++ b/RecoParticleFlow/PFClusterProducer/plugins/PFCTRecHitProducer.h @@ -41,7 +41,7 @@ class dso_hidden PFCTRecHitProducer final : public edm::stream::EDProducer<> { const edm::EventSetup & es) override; void produce(edm::Event& iEvent, - const edm::EventSetup& iSetup); + const edm::EventSetup& iSetup) override; reco::PFRecHit* createHcalRecHit( const DetId& detid, diff --git a/RecoParticleFlow/PFClusterProducer/plugins/SimMappers/GenericSimClusterMapper.h b/RecoParticleFlow/PFClusterProducer/plugins/SimMappers/GenericSimClusterMapper.h index 93f072f9e2d9c..912dab933ec3f 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/SimMappers/GenericSimClusterMapper.h +++ b/RecoParticleFlow/PFClusterProducer/plugins/SimMappers/GenericSimClusterMapper.h @@ -23,7 +23,7 @@ class GenericSimClusterMapper : public InitialClusteringStepBase { void buildClusters(const edm::Handle&, const std::vector&, const std::vector&, - reco::PFClusterCollection&); + reco::PFClusterCollection&) override; private: edm::EDGetTokenT _simClusterToken; diff --git a/RecoParticleFlow/PFClusterTools/interface/CalibratableTest.h b/RecoParticleFlow/PFClusterTools/interface/CalibratableTest.h index 1c6d9c30429d7..47348bab63bf1 100644 --- a/RecoParticleFlow/PFClusterTools/interface/CalibratableTest.h +++ b/RecoParticleFlow/PFClusterTools/interface/CalibratableTest.h @@ -69,9 +69,9 @@ class CalibratableTest : public edm::one::EDAnalyzer<> { /* * The usual EDAnalyzer methods */ - virtual void beginJob(); + virtual void beginJob() override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endJob(); + virtual void endJob() override; /* * Called for each particle in the event to fill the tree and diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h index 5e2925c91a17f..9fe8eb60333f1 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h +++ b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrackFilter.h @@ -33,7 +33,7 @@ class ClusterShapeTrackFilter : public PixelTrackFilter void update(const edm::Event& ev, const edm::EventSetup& es) override; virtual bool operator() (const reco::Track*, const std::vector &hits, - const TrackerTopology *tTopo) const; + const TrackerTopology *tTopo) const override; private: float areaParallelogram(const Global2DVector & a, diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h index c229676f0cd92..2e5ad7b66ec83 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h +++ b/RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h @@ -23,13 +23,13 @@ class ClusterShapeTrajectoryFilter : public TrajectoryFilter { void setEvent(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - virtual bool qualityFilter(const TempTrajectory&) const; - virtual bool qualityFilter(const Trajectory&) const; + virtual bool qualityFilter(const TempTrajectory&) const override; + virtual bool qualityFilter(const Trajectory&) const override; - virtual bool toBeContinued(TempTrajectory&) const; - virtual bool toBeContinued(Trajectory&) const; + virtual bool toBeContinued(TempTrajectory&) const override; + virtual bool toBeContinued(Trajectory&) const override; - virtual std::string name() const { return "ClusterShapeTrajectoryFilter"; } + virtual std::string name() const override { return "ClusterShapeTrajectoryFilter"; } private: edm::EDGetTokenT theCacheToken; diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h index a518ad072a9a3..921415e19c10d 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h +++ b/RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h @@ -79,7 +79,7 @@ class StripSubClusterShapeTrajectoryFilter: public StripSubClusterShapeFilterBas virtual bool toBeContinued(TempTrajectory&) const override; virtual bool toBeContinued(Trajectory&) const override; - virtual std::string name() const { return "StripSubClusterShapeTrajectoryFilter"; } + virtual std::string name() const override { return "StripSubClusterShapeTrajectoryFilter"; } virtual void setEvent(const edm::Event & e, const edm::EventSetup & es) override { setEventBase(e,es); @@ -100,10 +100,10 @@ class StripSubClusterShapeSeedFilter: public StripSubClusterShapeFilterBase, pub setEventBase(ev,es); } // implemented - virtual bool compatible(const TrajectoryStateOnSurface &tsos, SeedingHitSet::ConstRecHitPointer hit) const ; + virtual bool compatible(const TrajectoryStateOnSurface &tsos, SeedingHitSet::ConstRecHitPointer hit) const override ; // not implemented - virtual bool compatible(const SeedingHitSet &hits) const { return true; } - virtual bool compatible(const SeedingHitSet &hits, const GlobalTrajectoryParameters &helixStateAtVertex, const FastHelix &helix) const ; + virtual bool compatible(const SeedingHitSet &hits) const override { return true; } + virtual bool compatible(const SeedingHitSet &hits, const GlobalTrajectoryParameters &helixStateAtVertex, const FastHelix &helix) const override ; protected: bool filterAtHelixStage_; diff --git a/RecoPixelVertexing/PixelLowPtUtilities/interface/ValidHitPairFilter.h b/RecoPixelVertexing/PixelLowPtUtilities/interface/ValidHitPairFilter.h index 2d4a706d8530f..500ca20b70479 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/interface/ValidHitPairFilter.h +++ b/RecoPixelVertexing/PixelLowPtUtilities/interface/ValidHitPairFilter.h @@ -25,7 +25,7 @@ class ValidHitPairFilter : public PixelTrackFilter void update(const edm::Event& ev, const edm::EventSetup& es) override; virtual bool operator()(const reco::Track * track, const std::vector& recHits, - const TrackerTopology *tTopo) const; + const TrackerTopology *tTopo) const override; private: int getLayer(const TrackingRecHit & recHit, const TrackerTopology *tTopo) const; diff --git a/RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackFilterByKinematics.h b/RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackFilterByKinematics.h index 18dbbe6f22d72..6e13da305bca8 100644 --- a/RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackFilterByKinematics.h +++ b/RecoPixelVertexing/PixelTrackFitting/interface/PixelTrackFilterByKinematics.h @@ -12,8 +12,8 @@ class PixelTrackFilterByKinematics : public PixelTrackFilter { PixelTrackFilterByKinematics(double ptmin = 0.9, double tipmax = 0.1, double chi2max = 100.); virtual ~PixelTrackFilterByKinematics(); void update(const edm::Event&, const edm::EventSetup&) override; - virtual bool operator()(const reco::Track*) const; - virtual bool operator()(const reco::Track*, const PixelTrackFilter::Hits & hits) const; + virtual bool operator()(const reco::Track*) const override; + virtual bool operator()(const reco::Track*, const PixelTrackFilter::Hits & hits) const override; private: float theoPtMin, theNSigmaInvPtTolerance; float theTIPMax, theNSigmaTipMaxTolerance; diff --git a/RecoTauTag/HLTProducers/interface/TauJetSelectorForHLTTrackSeeding.h b/RecoTauTag/HLTProducers/interface/TauJetSelectorForHLTTrackSeeding.h index 1b11c770519b3..7285b4827f0a8 100644 --- a/RecoTauTag/HLTProducers/interface/TauJetSelectorForHLTTrackSeeding.h +++ b/RecoTauTag/HLTProducers/interface/TauJetSelectorForHLTTrackSeeding.h @@ -32,9 +32,9 @@ class TauJetSelectorForHLTTrackSeeding : public edm::global::EDProducer<> { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: - virtual void beginJob() ; + virtual void beginJob() override; virtual void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data --------------------------- diff --git a/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstCaloMuon.cc b/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstCaloMuon.cc index 05803eb570730..b5f06cd54d1c8 100644 --- a/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstCaloMuon.cc +++ b/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstCaloMuon.cc @@ -98,7 +98,7 @@ class TauDiscriminationAgainstCaloMuon final : public TauDiscriminationProducerB ~TauDiscriminationAgainstCaloMuon() {} // called at the beginning of every event - void beginEvent(const edm::Event&, const edm::EventSetup&); + void beginEvent(const edm::Event&, const edm::EventSetup&) override; double discriminate(const TauRef&) const override; diff --git a/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstMuon.cc b/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstMuon.cc index a0c664e26f3a2..bc6a7acfefee0 100644 --- a/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstMuon.cc +++ b/RecoTauTag/RecoTau/plugins/TauDiscriminationAgainstMuon.cc @@ -33,7 +33,7 @@ class TauDiscriminationAgainstMuon final : public TauDiscriminationProducerBase< ~TauDiscriminationAgainstMuon() {} // called at the beginning of every event - void beginEvent(const edm::Event&, const edm::EventSetup&); + void beginEvent(const edm::Event&, const edm::EventSetup&) override; double discriminate(const TauRef&) const override; diff --git a/RecoTracker/CkfPattern/interface/CkfTrajectoryBuilder.h b/RecoTracker/CkfPattern/interface/CkfTrajectoryBuilder.h index 7ce092b3a4fdf..d72da468b3d9f 100644 --- a/RecoTracker/CkfPattern/interface/CkfTrajectoryBuilder.h +++ b/RecoTracker/CkfPattern/interface/CkfTrajectoryBuilder.h @@ -44,18 +44,18 @@ class CkfTrajectoryBuilder :public BaseCkfTrajectoryBuilder { ~CkfTrajectoryBuilder() {} /// trajectories building starting from a seed - virtual TrajectoryContainer trajectories(const TrajectorySeed& seed) const; + virtual TrajectoryContainer trajectories(const TrajectorySeed& seed) const override; /// trajectories building starting from a seed - virtual void trajectories(const TrajectorySeed& seed, TrajectoryContainer &ret) const; + virtual void trajectories(const TrajectorySeed& seed, TrajectoryContainer &ret) const override; // new interface returning the start Trajectory... TempTrajectory buildTrajectories (const TrajectorySeed&, TrajectoryContainer &ret, - const TrajectoryFilter*) const; + const TrajectoryFilter*) const override; void rebuildTrajectories(TempTrajectory const& startingTraj, const TrajectorySeed&, - TrajectoryContainer& result) const {} + TrajectoryContainer& result) const override {} /// set Event for the internal MeasurementTracker data member // virtual void setEvent(const edm::Event& event) const; diff --git a/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h b/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h index 99d1359e9bc14..74fa4d8f5fd8b 100644 --- a/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h +++ b/RecoTracker/CkfPattern/plugins/GroupedCkfTrajectoryBuilder.h @@ -34,10 +34,10 @@ class dso_internal GroupedCkfTrajectoryBuilder final : public BaseCkfTrajectoryB // virtual void setEvent(const edm::Event& event) const; /// trajectories building starting from a seed - TrajectoryContainer trajectories(const TrajectorySeed&) const; + TrajectoryContainer trajectories(const TrajectorySeed&) const override; /// trajectories building starting from a seed, return in an already allocated vector - void trajectories(const TrajectorySeed&, TrajectoryContainer &ret) const; + void trajectories(const TrajectorySeed&, TrajectoryContainer &ret) const override; /// trajectories building starting from a seed with a region TrajectoryContainer trajectories(const TrajectorySeed&, const TrackingRegion&) const; @@ -49,7 +49,7 @@ class dso_internal GroupedCkfTrajectoryBuilder final : public BaseCkfTrajectoryB // also new interface returning the start Trajectory... TempTrajectory buildTrajectories (const TrajectorySeed&seed, TrajectoryContainer &ret, - const TrajectoryFilter*) const; + const TrajectoryFilter*) const override; @@ -60,11 +60,11 @@ class dso_internal GroupedCkfTrajectoryBuilder final : public BaseCkfTrajectoryB collection. **/ void rebuildSeedingRegion(const TrajectorySeed&, - TrajectoryContainer& result) const ; + TrajectoryContainer& result) const override ; // same as above using the precomputed startingTraj.. void rebuildTrajectories(TempTrajectory const & startingTraj, const TrajectorySeed&, - TrajectoryContainer& result) const ; + TrajectoryContainer& result) const override ; // Access to lower level components diff --git a/RecoTracker/DebugTools/interface/CkfDebugTrackCandidateMaker.h b/RecoTracker/DebugTools/interface/CkfDebugTrackCandidateMaker.h index 008a242bc9f87..30dbdc0212378 100644 --- a/RecoTracker/DebugTools/interface/CkfDebugTrackCandidateMaker.h +++ b/RecoTracker/DebugTools/interface/CkfDebugTrackCandidateMaker.h @@ -19,7 +19,7 @@ namespace cms { } virtual void produce(edm::Event& e, const edm::EventSetup& es) override {produceBase(e,es);} - virtual void endJob() {delete dbg; } + virtual void endJob() override {delete dbg; } private: virtual TrajectorySeedCollection::const_iterator @@ -33,9 +33,9 @@ namespace cms { //theTrajectoryBuilder->setDebugger( dbg); }; - void printHitsDebugger(edm::Event& e){dbg->printSimHits(e);}; - void countSeedsDebugger(){dbg->countSeed();}; - void deleteAssocDebugger(){dbg->deleteHitAssociator();}; + void printHitsDebugger(edm::Event& e) override{dbg->printSimHits(e);}; + void countSeedsDebugger() override{dbg->countSeed();}; + void deleteAssocDebugger() override{dbg->deleteHitAssociator();}; void deleteDebugger(){delete dbg;}; CkfDebugger * dbg; const CkfDebugTrajectoryBuilder* myTrajectoryBuilder; diff --git a/RecoTracker/MeasurementDet/plugins/Chi2ChargeMeasurementEstimatorESProducer.cc b/RecoTracker/MeasurementDet/plugins/Chi2ChargeMeasurementEstimatorESProducer.cc index 97e6bb4b1d803..5c4056e0b60b6 100644 --- a/RecoTracker/MeasurementDet/plugins/Chi2ChargeMeasurementEstimatorESProducer.cc +++ b/RecoTracker/MeasurementDet/plugins/Chi2ChargeMeasurementEstimatorESProducer.cc @@ -45,7 +45,7 @@ class Chi2ChargeMeasurementEstimator final : public Chi2MeasurementEstimator { const MeasurementEstimator::OpaquePayload & opay) const override; - virtual Chi2ChargeMeasurementEstimator* clone() const { + virtual Chi2ChargeMeasurementEstimator* clone() const override { return new Chi2ChargeMeasurementEstimator(*this); } private: diff --git a/RecoTracker/NuclearSeedGenerator/interface/NuclearTrackCorrector.h b/RecoTracker/NuclearSeedGenerator/interface/NuclearTrackCorrector.h index 2d348bd9e6dfd..9603c02eb0646 100644 --- a/RecoTracker/NuclearSeedGenerator/interface/NuclearTrackCorrector.h +++ b/RecoTracker/NuclearSeedGenerator/interface/NuclearTrackCorrector.h @@ -86,7 +86,7 @@ class NuclearTrackCorrector : public edm::EDProducer { private: virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; /// check if the trajectory has to be refitted and get the new trajectory bool newTrajNeeded(Trajectory& newtrajectory, const TrajectoryRef& trajRef, const reco::NuclearInteraction& ni); diff --git a/RecoTracker/SpecialSeedGenerators/interface/CosmicTrackingRegion.h b/RecoTracker/SpecialSeedGenerators/interface/CosmicTrackingRegion.h index bdb19bfcd5933..56967e8ebfcc0 100644 --- a/RecoTracker/SpecialSeedGenerators/interface/CosmicTrackingRegion.h +++ b/RecoTracker/SpecialSeedGenerators/interface/CosmicTrackingRegion.h @@ -97,11 +97,11 @@ class CosmicTrackingRegion : public TrackingRegionBase { const Hit & outerHit, const edm::EventSetup& iSetup, const DetLayer* outerlayer=0, - float lr=0, float gz=0, float dr=0, float dz=0) const {return 0; } + float lr=0, float gz=0, float dr=0, float dz=0) const override {return 0; } - CosmicTrackingRegion * clone() const { return new CosmicTrackingRegion(*this); } + CosmicTrackingRegion * clone() const override { return new CosmicTrackingRegion(*this); } - std::string name() const { return "CosmicTrackingRegion"; } + std::string name() const override { return "CosmicTrackingRegion"; } private: template diff --git a/RecoTracker/TkSeedGenerator/plugins/CombinedMultiHitGenerator.h b/RecoTracker/TkSeedGenerator/plugins/CombinedMultiHitGenerator.h index 793669dcfc0e0..b1f694e544ea0 100644 --- a/RecoTracker/TkSeedGenerator/plugins/CombinedMultiHitGenerator.h +++ b/RecoTracker/TkSeedGenerator/plugins/CombinedMultiHitGenerator.h @@ -33,7 +33,7 @@ class dso_hidden CombinedMultiHitGenerator final : public MultiHitGenerator { /// from base class virtual void hitSets( const TrackingRegion& reg, OrderedMultiHits & result, - const edm::Event & ev, const edm::EventSetup& es); + const edm::Event & ev, const edm::EventSetup& es) override; virtual void clear() override { MultiHitGenerator::clear(); diff --git a/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.h b/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.h index 10180b64f66f9..5e60bc0eae13e 100644 --- a/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.h +++ b/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.h @@ -42,7 +42,7 @@ typedef CombinedMultiHitGenerator::LayerCacheType LayerCacheType; virtual void hitSets( const TrackingRegion& region, OrderedMultiHits & trs, const edm::Event & ev, const edm::EventSetup& es, SeedingLayerSetsHits::SeedingLayerSet pairLayers, - std::vector thirdLayers); + std::vector thirdLayers) override; void hitSets(const TrackingRegion& region, OrderedMultiHits& trs, const edm::Event& ev, const edm::EventSetup& es, diff --git a/RecoTracker/TkSeedingLayers/src/HitExtractorPIX.h b/RecoTracker/TkSeedingLayers/src/HitExtractorPIX.h index b92643fba2356..02078c15a8bf4 100644 --- a/RecoTracker/TkSeedingLayers/src/HitExtractorPIX.h +++ b/RecoTracker/TkSeedingLayers/src/HitExtractorPIX.h @@ -16,7 +16,7 @@ namespace ctfseeding { HitExtractorPIX( SeedingLayer::Side & side, int idLayer, const std::string & hitProducer, edm::ConsumesCollector& iC); virtual ~HitExtractorPIX(){} virtual HitExtractor::Hits hits(const TkTransientTrackingRecHitBuilder &ttrhBuilder, const edm::Event& , const edm::EventSetup& ) const override; - virtual HitExtractorPIX * clone() const { return new HitExtractorPIX(*this); } + virtual HitExtractorPIX * clone() const override { return new HitExtractorPIX(*this); } private: typedef edm::ContainerMask > SkipClustersCollection; diff --git a/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.h b/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.h index 1f807236d2348..d3538a10d4a40 100644 --- a/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.h +++ b/RecoTracker/TkSeedingLayers/src/HitExtractorSTRP.h @@ -28,7 +28,7 @@ class HitExtractorSTRP final : public HitExtractor { virtual ~HitExtractorSTRP(){} virtual HitExtractor::Hits hits( const TkTransientTrackingRecHitBuilder &ttrhBuilder, const edm::Event& , const edm::EventSetup&) const override; - virtual HitExtractorSTRP * clone() const { return new HitExtractorSTRP(*this); } + virtual HitExtractorSTRP * clone() const override { return new HitExtractorSTRP(*this); } void useMatchedHits( const edm::InputTag & m, edm::ConsumesCollector& iC) { hasMatchedHits = true; theMatchedHits = iC.consumes(m); } void useRPhiHits( const edm::InputTag & m, edm::ConsumesCollector& iC) { hasRPhiHits = true; theRPhiHits = iC.consumes(m); } diff --git a/RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h b/RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h index 9de4285f13ded..4a215ee513bff 100644 --- a/RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h +++ b/RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h @@ -42,14 +42,14 @@ class GlobalTrackingRegion final : public TrackingRegion { const Hit & outerHit, const edm::EventSetup& iSetup, const DetLayer* outerlayer=0, - float lr=0, float gz=0, float dr=0, float dz=0) const ; + float lr=0, float gz=0, float dr=0, float dz=0) const override; - virtual GlobalTrackingRegion* clone() const { + virtual GlobalTrackingRegion* clone() const override { return new GlobalTrackingRegion(*this); } - virtual std::string name() const { return "GlobalTrackingRegion"; } - virtual std::string print() const; + virtual std::string name() const override { return "GlobalTrackingRegion"; } + virtual std::string print() const override; private: bool thePrecise=false; diff --git a/RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h b/RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h index e7376099c4d21..8a3fc7ba556a5 100644 --- a/RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h +++ b/RecoTracker/TkTrackingRegions/interface/RectangularEtaPhiTrackingRegion.h @@ -164,15 +164,15 @@ class RectangularEtaPhiTrackingRegion final : public TrackingRegion { const Hit & outerHit, const edm::EventSetup&iSetup, const DetLayer* outerlayer=nullptr, - float lr=0, float gz=0, float dr=0, float dz=0) const + float lr=0, float gz=0, float dr=0, float dz=0) const override { return checkRZOld(layer,outerHit,iSetup, outerlayer); } - virtual RectangularEtaPhiTrackingRegion* clone() const { + virtual RectangularEtaPhiTrackingRegion* clone() const override { return new RectangularEtaPhiTrackingRegion(*this); } - virtual std::string name() const { return "RectangularEtaPhiTrackingRegion"; } - virtual std::string print() const; + virtual std::string name() const override { return "RectangularEtaPhiTrackingRegion"; } + virtual std::string print() const override; private: HitRZCompatibility* checkRZOld( diff --git a/RecoTracker/TrackProducer/test/GsfVertexConstraintProducer.cc b/RecoTracker/TrackProducer/test/GsfVertexConstraintProducer.cc index 51f1b485d2962..21f92b27a0036 100644 --- a/RecoTracker/TrackProducer/test/GsfVertexConstraintProducer.cc +++ b/RecoTracker/TrackProducer/test/GsfVertexConstraintProducer.cc @@ -25,7 +25,7 @@ class GsfVertexConstraintProducer: public edm::EDProducer { private: virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; // ----------member data --------------------------- const edm::ParameterSet iConfig_; diff --git a/RecoTracker/TrackProducer/test/MomentumConstraintProducer.cc b/RecoTracker/TrackProducer/test/MomentumConstraintProducer.cc index 8d5c2ad570118..9cf979975e8a2 100644 --- a/RecoTracker/TrackProducer/test/MomentumConstraintProducer.cc +++ b/RecoTracker/TrackProducer/test/MomentumConstraintProducer.cc @@ -45,7 +45,7 @@ class MomentumConstraintProducer: public edm::EDProducer { private: virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; // ----------member data --------------------------- const edm::InputTag srcTag_; diff --git a/RecoTracker/TrackProducer/test/TwoBodyDecayConstraintProducer.cc b/RecoTracker/TrackProducer/test/TwoBodyDecayConstraintProducer.cc index 6e9a991cc3d03..2ba068dff557d 100644 --- a/RecoTracker/TrackProducer/test/TwoBodyDecayConstraintProducer.cc +++ b/RecoTracker/TrackProducer/test/TwoBodyDecayConstraintProducer.cc @@ -47,7 +47,7 @@ class TwoBodyDecayConstraintProducer: public edm::EDProducer private: virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; std::pair innermostState( const reco::TransientTrack& ttrack ) const; bool match( const TrajectoryStateOnSurface& newTsos, const TrajectoryStateOnSurface& oldTsos ) const; diff --git a/RecoTracker/TrackProducer/test/TwoBodyDecayMomConstraintProducer.cc b/RecoTracker/TrackProducer/test/TwoBodyDecayMomConstraintProducer.cc index a9748a4f18b17..c204bb176a2ec 100644 --- a/RecoTracker/TrackProducer/test/TwoBodyDecayMomConstraintProducer.cc +++ b/RecoTracker/TrackProducer/test/TwoBodyDecayMomConstraintProducer.cc @@ -48,7 +48,7 @@ class TwoBodyDecayMomConstraintProducer: public edm::EDProducer private: virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; std::pair momentaAtVertex( const TwoBodyDecay& tbd ) const; diff --git a/RecoTracker/TrackProducer/test/VertexConstraintProducer.cc b/RecoTracker/TrackProducer/test/VertexConstraintProducer.cc index c92d9009128fd..8b35adb6780e6 100644 --- a/RecoTracker/TrackProducer/test/VertexConstraintProducer.cc +++ b/RecoTracker/TrackProducer/test/VertexConstraintProducer.cc @@ -47,7 +47,7 @@ class VertexConstraintProducer: public edm::EDProducer { private: virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; // ----------member data --------------------------- const edm::ParameterSet iConfig_; diff --git a/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h b/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h index efc7684368af9..7b36bd2c44b89 100644 --- a/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h +++ b/RecoTracker/TransientTrackingRecHit/interface/TRecHit1DMomConstraint.h @@ -11,29 +11,29 @@ class TRecHit1DMomConstraint final : public TransientTrackingRecHit { virtual ~TRecHit1DMomConstraint() {} - virtual AlgebraicVector parameters() const { + virtual AlgebraicVector parameters() const override { AlgebraicVector result(1); result[0] = charge_/fabs(mom_); return result; } - virtual AlgebraicSymMatrix parametersError() const { + virtual AlgebraicSymMatrix parametersError() const override { AlgebraicSymMatrix m(1); m[0][0] = err_/(mom_*mom_);//parametersErrors are squared m[0][0] *= m[0][0]; return m; } - virtual AlgebraicMatrix projectionMatrix() const { + virtual AlgebraicMatrix projectionMatrix() const override { AlgebraicMatrix theProjectionMatrix; theProjectionMatrix = AlgebraicMatrix( 1, 5, 0); theProjectionMatrix[0][0] = 1; return theProjectionMatrix; } - virtual int dimension() const {return 1;} + virtual int dimension() const override {return 1;} - virtual LocalPoint localPosition() const {return LocalPoint(0,0,0);} - virtual LocalError localPositionError() const {return LocalError(0,0,0);} + virtual LocalPoint localPosition() const override {return LocalPoint(0,0,0);} + virtual LocalError localPositionError() const override {return LocalError(0,0,0);} double mom() const {return mom_;} double err() const {return err_;} @@ -41,11 +41,11 @@ class TRecHit1DMomConstraint final : public TransientTrackingRecHit { virtual const TrackingRecHit * hit() const override {return 0;}//fixme return invalid - virtual TrackingRecHit * cloneHit() const { return 0;} + virtual TrackingRecHit * cloneHit() const override { return 0;} - virtual std::vector recHits() const { return std::vector(); } - virtual std::vector recHits() { return std::vector(); } - virtual bool sharesInput( const TrackingRecHit*, SharedInputType) const { return false;} + virtual std::vector recHits() const override { return std::vector(); } + virtual std::vector recHits() override { return std::vector(); } + virtual bool sharesInput( const TrackingRecHit*, SharedInputType) const override { return false;} virtual bool canImproveWithTrack() const override {return false;} @@ -62,11 +62,11 @@ class TRecHit1DMomConstraint final : public TransientTrackingRecHit { virtual const Surface * surface() const override {return surface_;} - virtual GlobalPoint globalPosition() const { return GlobalPoint(); } - virtual GlobalError globalPositionError() const { return GlobalError();} - virtual float errorGlobalR() const { return 0;} - virtual float errorGlobalZ() const { return 0; } - virtual float errorGlobalRPhi() const { return 0; } + virtual GlobalPoint globalPosition() const override { return GlobalPoint(); } + virtual GlobalError globalPositionError() const override { return GlobalError();} + virtual float errorGlobalR() const override { return 0;} + virtual float errorGlobalZ() const override { return 0; } + virtual float errorGlobalRPhi() const override { return 0; } private: @@ -84,7 +84,7 @@ class TRecHit1DMomConstraint final : public TransientTrackingRecHit { TRecHit1DMomConstraint( const TRecHit1DMomConstraint& other ): charge_( other.charge() ), mom_( other.mom() ),err_( other.err() ), surface_((other.surface())) {} - virtual TRecHit1DMomConstraint * clone() const { + virtual TRecHit1DMomConstraint * clone() const override { return new TRecHit1DMomConstraint(*this); } diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h index 629345adc9c86..b52727f3bea21 100644 --- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h +++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h @@ -40,7 +40,7 @@ class EcalTPInputAnalyzer : public edm::EDAnalyzer { ~EcalTPInputAnalyzer(); virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob(); + void endJob() override; private: diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h index 3f9df94db4c7b..9f8d279616172 100644 --- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h +++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h @@ -42,7 +42,7 @@ class EcalTrigPrimAnalyzer : public edm::one::EDAnalyzer<> { virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endJob(); + virtual void endJob() override; private: // for histos of nr of hits diff --git a/SimCalorimetry/HcalSimAlgos/interface/HcalSiPMHitResponse.h b/SimCalorimetry/HcalSimAlgos/interface/HcalSiPMHitResponse.h index a9156deca85b5..b51577f21ca61 100644 --- a/SimCalorimetry/HcalSimAlgos/interface/HcalSiPMHitResponse.h +++ b/SimCalorimetry/HcalSimAlgos/interface/HcalSiPMHitResponse.h @@ -34,7 +34,7 @@ class HcalSiPMHitResponse : public CaloHitResponse { typedef std::vector photonTimeHist; typedef std::map< DetId, photonTimeHist > photonTimeMap; - virtual void initializeHits(); + virtual void initializeHits() override; virtual void finalizeHits(CLHEP::HepRandomEngine*) override; diff --git a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc index c6b0eb8d0bdbe..84adb3af656a9 100644 --- a/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc +++ b/SimG4CMS/HGCalTestBeam/plugins/HGCalTBAnalyzer.cc @@ -55,7 +55,7 @@ class HGCalTBAnalyzer : public edm::one::EDAnalyzer { private: - virtual void beginJob() ; + virtual void beginJob() override ; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override; // ----------member data --------------------------- diff --git a/SimGeneral/MixingModule/plugins/MixingModule.h b/SimGeneral/MixingModule/plugins/MixingModule.h index 837829c54a8f4..5da6e9e7455d1 100644 --- a/SimGeneral/MixingModule/plugins/MixingModule.h +++ b/SimGeneral/MixingModule/plugins/MixingModule.h @@ -66,22 +66,22 @@ namespace edm { virtual void endLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) override; - void initializeEvent(Event const& event, EventSetup const& setup); + void initializeEvent(Event const& event, EventSetup const& setup) override; void accumulateEvent(Event const& event, EventSetup const& setup); void accumulateEvent(PileUpEventPrincipal const& event, EventSetup const& setup, edm::StreamID const&); - void finalizeEvent(Event& event, EventSetup const& setup); + void finalizeEvent(Event& event, EventSetup const& setup) override; - virtual void reload(const edm::EventSetup &); + virtual void reload(const edm::EventSetup &) override; private: virtual void branchesActivate(const std::string &friendlyName, const std::string &subdet, InputTag &tag, std::string &label); - virtual void put(edm::Event &e,const edm::EventSetup& es); - virtual void createnewEDProduct(); - virtual void checkSignal(const edm::Event &e); - virtual void addSignals(const edm::Event &e, const edm::EventSetup& es); + virtual void put(edm::Event &e,const edm::EventSetup& es) override; + virtual void createnewEDProduct() override; + virtual void checkSignal(const edm::Event &e) override; + virtual void addSignals(const edm::Event &e, const edm::EventSetup& es) override; virtual void doPileUp(edm::Event &e, const edm::EventSetup& es) override; void pileAllWorkers(EventPrincipal const& ep, ModuleCallingContext const*, int bcr, int id, int& offset, const edm::EventSetup& setup, edm::StreamID const&); diff --git a/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.h b/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.h index d202904974045..c1295e78c1797 100644 --- a/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.h +++ b/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.h @@ -48,9 +48,9 @@ namespace edm { virtual void dummyFunction(EventPrincipal const& ep) {} private: - virtual void beginJob() ; + virtual void beginJob() override ; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; // ----------member data --------------------------- int minBunch_; diff --git a/SimGeneral/MixingModule/plugins/TestMixedSource.h b/SimGeneral/MixingModule/plugins/TestMixedSource.h index 4197fbc580628..a82d0a81a55ef 100644 --- a/SimGeneral/MixingModule/plugins/TestMixedSource.h +++ b/SimGeneral/MixingModule/plugins/TestMixedSource.h @@ -48,9 +48,9 @@ namespace edm ~TestMixedSource(); private: - virtual void beginJob() ; + virtual void beginJob() override ; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endJob() ; + virtual void endJob() override ; // ----------member data --------------------------- std::ofstream outputFile; diff --git a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h index 081c8e3540374..31c2302dc44b2 100644 --- a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h +++ b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h @@ -47,11 +47,11 @@ class CSCStripElectronicsSim : public CSCBaseElectronicsSim private: /// initialization for each layer - void initParameters(); + void initParameters() override; - virtual int readoutElement(int strip) const; + virtual int readoutElement(int strip) const override; - float calculateAmpResponse(float t) const; + float calculateAmpResponse(float t) const override; CSCStripAmpResponse theAmpResponse; void runComparator(std::vector & result, CLHEP::HepRandomEngine*); diff --git a/SimMuon/GEMDigitizer/interface/GEMSimpleModel.h b/SimMuon/GEMDigitizer/interface/GEMSimpleModel.h index df937d910139c..9dbc9b23942a8 100644 --- a/SimMuon/GEMDigitizer/interface/GEMSimpleModel.h +++ b/SimMuon/GEMDigitizer/interface/GEMSimpleModel.h @@ -27,7 +27,7 @@ class GEMSimpleModel: public GEMDigiModel ~GEMSimpleModel(); - void setup(); + void setup() override; void simulateSignal(const GEMEtaPartition*, const edm::PSimHitContainer&, CLHEP::HepRandomEngine*) override; diff --git a/SimMuon/GEMDigitizer/interface/ME0PreRecoGaussianModel.h b/SimMuon/GEMDigitizer/interface/ME0PreRecoGaussianModel.h index ca2382a88f94d..e79bb9b0487e5 100644 --- a/SimMuon/GEMDigitizer/interface/ME0PreRecoGaussianModel.h +++ b/SimMuon/GEMDigitizer/interface/ME0PreRecoGaussianModel.h @@ -26,7 +26,7 @@ class ME0PreRecoGaussianModel: public ME0DigiPreRecoModel void simulateSignal(const ME0EtaPartition*, const edm::PSimHitContainer&, CLHEP::HepRandomEngine*) override; void simulateNoise(const ME0EtaPartition*, CLHEP::HepRandomEngine*) override; double correctSigmaU(const ME0EtaPartition*, double); - void setup() {} + void setup() override {} private: double sigma_t; diff --git a/SimMuon/GEMDigitizer/interface/ME0PreRecoNoSmearModel.h b/SimMuon/GEMDigitizer/interface/ME0PreRecoNoSmearModel.h index 799a792dc3c30..5a0b0db0fd059 100644 --- a/SimMuon/GEMDigitizer/interface/ME0PreRecoNoSmearModel.h +++ b/SimMuon/GEMDigitizer/interface/ME0PreRecoNoSmearModel.h @@ -23,7 +23,7 @@ class ME0PreRecoNoSmearModel: public ME0DigiPreRecoModel void simulateNoise(const ME0EtaPartition*, CLHEP::HepRandomEngine*) override; - void setup() {} + void setup() override {} private: }; diff --git a/SimMuon/MCTruth/plugins/SeedToTrackProducer.h b/SimMuon/MCTruth/plugins/SeedToTrackProducer.h index 6bfe2e4333a87..cda7781222d82 100644 --- a/SimMuon/MCTruth/plugins/SeedToTrackProducer.h +++ b/SimMuon/MCTruth/plugins/SeedToTrackProducer.h @@ -52,9 +52,9 @@ class SeedToTrackProducer : public edm::one::EDProducer<> { ~SeedToTrackProducer(); private: - virtual void beginJob(); + virtual void beginJob() override; virtual void produce(edm::Event&, const edm::EventSetup&) override; - virtual void endJob(); + virtual void endJob() override; virtual TrajectoryStateOnSurface seedTransientState(const TrajectorySeed&); // ----------member data --------------------------- diff --git a/SimMuon/RPCDigitizer/src/RPCSimAsymmetricCls.h b/SimMuon/RPCDigitizer/src/RPCSimAsymmetricCls.h index b53525dee739e..a6a0bd1d25f3a 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimAsymmetricCls.h +++ b/SimMuon/RPCDigitizer/src/RPCSimAsymmetricCls.h @@ -45,7 +45,7 @@ class RPCSimAsymmetricCls : public RPCSim unsigned int slice(float posX); //??? CLHEP::HepRandomEngine*); private: - void init(){}; + void init() override{}; private: double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimAverage.h b/SimMuon/RPCDigitizer/src/RPCSimAverage.h index af5b1a99c2a9e..030d6b8f0898c 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimAverage.h +++ b/SimMuon/RPCDigitizer/src/RPCSimAverage.h @@ -41,7 +41,7 @@ class RPCSimAverage : public RPCSim int getClSize(float posX, CLHEP::HepRandomEngine*); private: - void init(){}; + void init() override{}; private: double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimAverageNoise.h b/SimMuon/RPCDigitizer/src/RPCSimAverageNoise.h index ef6c69c55eeda..e63acc60111d9 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimAverageNoise.h +++ b/SimMuon/RPCDigitizer/src/RPCSimAverageNoise.h @@ -41,7 +41,7 @@ class RPCSimAverageNoise : public RPCSim int getClSize(float posX, CLHEP::HepRandomEngine*); private: - void init(){}; + void init() override{}; private: double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEff.h b/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEff.h index 380c6ce4dd6b0..e31cada9a56d1 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEff.h +++ b/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEff.h @@ -42,7 +42,7 @@ class RPCSimAverageNoiseEff : public RPCSim int getClSize(float posX, CLHEP::HepRandomEngine*); private: - void init(){}; + void init() override{}; private: double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEffCls.h b/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEffCls.h index 87370dfc8731e..bc348f884164f 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEffCls.h +++ b/SimMuon/RPCDigitizer/src/RPCSimAverageNoiseEffCls.h @@ -44,7 +44,7 @@ class RPCSimAverageNoiseEffCls : public RPCSim // private: protected: - void init(){}; + void init() override{}; double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimModelTiming.h b/SimMuon/RPCDigitizer/src/RPCSimModelTiming.h index e19e4437e71d4..67d53be8b0580 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimModelTiming.h +++ b/SimMuon/RPCDigitizer/src/RPCSimModelTiming.h @@ -41,7 +41,7 @@ class RPCSimModelTiming : public RPCSim int getClSize(uint32_t id,float posX, CLHEP::HepRandomEngine*); protected: - void init(){}; + void init() override{}; double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimParam.h b/SimMuon/RPCDigitizer/src/RPCSimParam.h index a3d061a562ede..ddd4f09c22255 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimParam.h +++ b/SimMuon/RPCDigitizer/src/RPCSimParam.h @@ -31,7 +31,7 @@ class RPCSimParam : public RPCSim CLHEP::HepRandomEngine*) override; private: - void init(){}; + void init() override{}; private: double aveEff; double aveCls; diff --git a/SimMuon/RPCDigitizer/src/RPCSimSimple.h b/SimMuon/RPCDigitizer/src/RPCSimSimple.h index 19fad4243cbb1..88e927cac66db 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimSimple.h +++ b/SimMuon/RPCDigitizer/src/RPCSimSimple.h @@ -29,7 +29,7 @@ class RPCSimSimple : public RPCSim void simulateNoise(const RPCRoll*, CLHEP::HepRandomEngine*) override; private: - void init(){}; + void init() override{}; RPCSynchronizer* _rpcSync; int N_hits; diff --git a/SimMuon/RPCDigitizer/src/RPCSimTriv.h b/SimMuon/RPCDigitizer/src/RPCSimTriv.h index c1d3d8e986003..6f6eb318959dc 100644 --- a/SimMuon/RPCDigitizer/src/RPCSimTriv.h +++ b/SimMuon/RPCDigitizer/src/RPCSimTriv.h @@ -30,7 +30,7 @@ class RPCSimTriv : public RPCSim CLHEP::HepRandomEngine*) override; private: - void init(){}; + void init() override{}; RPCSynchronizer* _rpcSync; diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.h b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.h index 00b102ec3c035..ba536d822b4d5 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.h +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.h @@ -63,11 +63,11 @@ namespace cms { virtual void StorePileupInformation( std::vector &numInteractionList, std::vector &bunchCrossingList, std::vector &TrueInteractionList, - std::vector &eventInfoList, int bunchSpacing){ + std::vector &eventInfoList, int bunchSpacing) override{ PileupInfo_ = new PileupMixingContent(numInteractionList, bunchCrossingList, TrueInteractionList, eventInfoList, bunchSpacing); } - virtual PileupMixingContent* getEventPileupInfo() { return PileupInfo_; } + virtual PileupMixingContent* getEventPileupInfo() override { return PileupInfo_; } private: void accumulatePixelHits(edm::Handle >, diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h index e3ab0ad5dd44f..0d6cccc3553b3 100644 --- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h +++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h @@ -57,11 +57,11 @@ class SiStripDigitizer : public DigiAccumulatorMixMod { virtual void StorePileupInformation( std::vector &numInteractionList, std::vector &bunchCrossingList, std::vector &TrueInteractionList, - std::vector &eventInfoList, int bunchSpacing){ + std::vector &eventInfoList, int bunchSpacing) override{ PileupInfo_ = new PileupMixingContent(numInteractionList, bunchCrossingList, TrueInteractionList, eventInfoList, bunchSpacing); } - virtual PileupMixingContent* getEventPileupInfo() { return PileupInfo_; } + virtual PileupMixingContent* getEventPileupInfo() override { return PileupInfo_; } private: diff --git a/TrackingTools/GsfTools/interface/BasicMultiTrajectoryState.h b/TrackingTools/GsfTools/interface/BasicMultiTrajectoryState.h index 1d599c698a184..2080932bfb4cf 100644 --- a/TrackingTools/GsfTools/interface/BasicMultiTrajectoryState.h +++ b/TrackingTools/GsfTools/interface/BasicMultiTrajectoryState.h @@ -38,13 +38,13 @@ class BasicMultiTrajectoryState final : public BasicTrajectoryState { } using Components = BasicTrajectoryState::Components; - Components const & components() const { + Components const & components() const override { return theStates; } bool singleState() const override { return false;} - virtual bool canUpdateLocalParameters() const { return false; } + virtual bool canUpdateLocalParameters() const override { return false; } virtual void update( const LocalTrajectoryParameters& p, const Surface& aSurface, const MagneticField* field, diff --git a/TrackingTools/GsfTools/interface/GsfPropagatorAdapter.h b/TrackingTools/GsfTools/interface/GsfPropagatorAdapter.h index fc1a1f61a896c..c1cea717488ff 100644 --- a/TrackingTools/GsfTools/interface/GsfPropagatorAdapter.h +++ b/TrackingTools/GsfTools/interface/GsfPropagatorAdapter.h @@ -48,7 +48,7 @@ class GsfPropagatorAdapter final : public Propagator { public: - virtual bool setMaxDirectionChange( float phiMax) { + virtual bool setMaxDirectionChange( float phiMax) override { return thePropagator->setMaxDirectionChange(phiMax); } @@ -60,12 +60,12 @@ class GsfPropagatorAdapter final : public Propagator { return *thePropagator; } - virtual GsfPropagatorAdapter* clone() const + virtual GsfPropagatorAdapter* clone() const override { return new GsfPropagatorAdapter(*thePropagator); } - virtual const MagneticField* magneticField() const { + virtual const MagneticField* magneticField() const override { return thePropagator->magneticField(); } diff --git a/TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h b/TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h index 525d6038bdb1c..00be308fb1d3e 100644 --- a/TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h +++ b/TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h @@ -15,7 +15,7 @@ class KullbackLeiblerDistance final : public DistanceBetweenComponents { double operator() (const SingleGaussianState&, const SingleGaussianState&) const override; - virtual KullbackLeiblerDistance* clone() const + virtual KullbackLeiblerDistance* clone() const override { return new KullbackLeiblerDistance(*this); } diff --git a/TrackingTools/GsfTracking/interface/GsfPropagatorWithMaterial.h b/TrackingTools/GsfTracking/interface/GsfPropagatorWithMaterial.h index b1064a5e73ff9..76c223d0431dc 100644 --- a/TrackingTools/GsfTracking/interface/GsfPropagatorWithMaterial.h +++ b/TrackingTools/GsfTracking/interface/GsfPropagatorWithMaterial.h @@ -67,7 +67,7 @@ class GsfPropagatorWithMaterial : public Propagator { - virtual bool setMaxDirectionChange( float phiMax) { + virtual bool setMaxDirectionChange( float phiMax) override { return theGeometricalPropagator->setMaxDirectionChange(phiMax); } @@ -94,12 +94,12 @@ class GsfPropagatorWithMaterial : public Propagator { return *theConvolutor; } - virtual GsfPropagatorWithMaterial* clone() const + virtual GsfPropagatorWithMaterial* clone() const override { return new GsfPropagatorWithMaterial(*theGeometricalPropagator,*theConvolutor); } - const MagneticField* magneticField() const {return theGeometricalPropagator->magneticField();} + const MagneticField* magneticField() const override {return theGeometricalPropagator->magneticField();} private: // /// Definition of timers (temporary) diff --git a/TrackingTools/GsfTracking/interface/GsfTrajectoryFitter.h b/TrackingTools/GsfTracking/interface/GsfTrajectoryFitter.h index 228579a2a5fbb..b2a0119a45a81 100644 --- a/TrackingTools/GsfTracking/interface/GsfTrajectoryFitter.h +++ b/TrackingTools/GsfTracking/interface/GsfTrajectoryFitter.h @@ -36,12 +36,12 @@ class GsfTrajectoryFitter final : public TrajectoryFitter { virtual ~GsfTrajectoryFitter(); - Trajectory fitOne(const Trajectory& t, fitType type) const; + Trajectory fitOne(const Trajectory& t, fitType type) const override; Trajectory fitOne(const TrajectorySeed& aSeed, const RecHitContainer& hits, - const TrajectoryStateOnSurface& firstPredTsos, fitType type) const; + const TrajectoryStateOnSurface& firstPredTsos, fitType type) const override; Trajectory fitOne(const TrajectorySeed& aSeed, - const RecHitContainer& hits, fitType type) const; + const RecHitContainer& hits, fitType type) const override; @@ -61,7 +61,7 @@ class GsfTrajectoryFitter final : public TrajectoryFitter { theGeometry)); } - virtual void setHitCloner(TkCloner const * hc) { + virtual void setHitCloner(TkCloner const * hc) override { theHitCloner = hc; } diff --git a/TrackingTools/GsfTracking/interface/GsfTrajectorySmoother.h b/TrackingTools/GsfTracking/interface/GsfTrajectorySmoother.h index 6424c7616fa72..b30b77a4af2a2 100644 --- a/TrackingTools/GsfTracking/interface/GsfTrajectorySmoother.h +++ b/TrackingTools/GsfTracking/interface/GsfTrajectorySmoother.h @@ -51,7 +51,7 @@ class GsfTrajectorySmoother final : public TrajectorySmoother { *theMerger,theErrorRescaling,theMatBeforeUpdate,theGeometry); } - virtual void setHitCloner(TkCloner const * hc) { + virtual void setHitCloner(TkCloner const * hc) override{ } diff --git a/TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h b/TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h index 2f77ee3388f9a..df465f60ed221 100755 --- a/TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h +++ b/TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h @@ -62,7 +62,7 @@ class PropagatorWithMaterial final : public Propagator { public: /// Limit on change in azimuthal angle - virtual bool setMaxDirectionChange( float phiMax) { + virtual bool setMaxDirectionChange( float phiMax) override{ return theGeometricalPropagator->setMaxDirectionChange(phiMax); } /// Propagation direction @@ -89,10 +89,10 @@ class PropagatorWithMaterial final : public Propagator { return *theMEUpdator; } - virtual const MagneticField* magneticField() const {return field;} + virtual const MagneticField* magneticField() const override {return field;} - virtual PropagatorWithMaterial* clone() const + virtual PropagatorWithMaterial* clone() const override { return new PropagatorWithMaterial(*this); } diff --git a/TrackingTools/TrackAssociator/plugins/EcalDetIdAssociator.h b/TrackingTools/TrackAssociator/plugins/EcalDetIdAssociator.h index a9200e1d5e4b1..9bc7f7543d8f0 100644 --- a/TrackingTools/TrackAssociator/plugins/EcalDetIdAssociator.h +++ b/TrackingTools/TrackAssociator/plugins/EcalDetIdAssociator.h @@ -31,7 +31,7 @@ class EcalDetIdAssociator: public CaloDetIdAssociator{ protected: virtual const unsigned int getNumberOfSubdetectors() const override { return 2;} - virtual void getValidDetIds(unsigned int subDetectorIndex, std::vector& validIds) const { + virtual void getValidDetIds(unsigned int subDetectorIndex, std::vector& validIds) const override{ if ( subDetectorIndex == 0 ) validIds = geometry_->getValidDetIds(DetId::Ecal, EcalBarrel);//EB else diff --git a/TrackingTools/TrackAssociator/plugins/HcalDetIdAssociator.h b/TrackingTools/TrackAssociator/plugins/HcalDetIdAssociator.h index 243640a492e30..e8ca8310e147d 100644 --- a/TrackingTools/TrackAssociator/plugins/HcalDetIdAssociator.h +++ b/TrackingTools/TrackAssociator/plugins/HcalDetIdAssociator.h @@ -34,7 +34,7 @@ class HcalDetIdAssociator: public CaloDetIdAssociator{ int hcalReg_; virtual const unsigned int getNumberOfSubdetectors() const override { return hcalReg_;} - void getValidDetIds(unsigned int subDetectorIndex, std::vector& validIds) const { + void getValidDetIds(unsigned int subDetectorIndex, std::vector& validIds) const override { if ( subDetectorIndex == 0 ) validIds = geometry_->getValidDetIds(DetId::Hcal, HcalBarrel);//HB else diff --git a/TrackingTools/TrackFitters/interface/KFSplittingFitter.h b/TrackingTools/TrackFitters/interface/KFSplittingFitter.h index 2f02a7caa7537..946e22d18a270 100644 --- a/TrackingTools/TrackFitters/interface/KFSplittingFitter.h +++ b/TrackingTools/TrackFitters/interface/KFSplittingFitter.h @@ -42,16 +42,16 @@ class KFSplittingFitter final : public TrajectoryFitter { } Trajectory fitOne(const Trajectory& aTraj, - fitType type) const; + fitType type) const override; Trajectory fitOne(const TrajectorySeed& aSeed, const RecHitContainer& hits, - fitType type) const; + fitType type) const override; Trajectory fitOne(const TrajectorySeed& aSeed, const RecHitContainer& hits, const TSOS& firstPredTsos, - fitType type) const; + fitType type) const override; - virtual void setHitCloner(TkCloner const * hc) { + virtual void setHitCloner(TkCloner const * hc) override{ fitter.setHitCloner(hc); } diff --git a/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h b/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h index d118aed82d7ee..0b61e035d0233 100644 --- a/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h +++ b/TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h @@ -74,13 +74,13 @@ class KFTrajectoryFitter final: public TrajectoryFitter { } } - Trajectory fitOne(const Trajectory& aTraj,fitType) const; + Trajectory fitOne(const Trajectory& aTraj,fitType) const override; Trajectory fitOne(const TrajectorySeed& aSeed, - const RecHitContainer& hits,fitType) const; + const RecHitContainer& hits,fitType) const override; Trajectory fitOne(const TrajectorySeed& aSeed, const RecHitContainer& hits, - const TSOS& firstPredTsos,fitType) const; + const TSOS& firstPredTsos,fitType) const override; const Propagator* propagator() const {return thePropagator;} const TrajectoryStateUpdator* updator() const {return theUpdator;} @@ -101,7 +101,7 @@ class KFTrajectoryFitter final: public TrajectoryFitter { } // FIXME a prototype: final inplementaiton may differ - virtual void setHitCloner(TkCloner const * hc) { theHitCloner = hc;} + virtual void setHitCloner(TkCloner const * hc) override { theHitCloner = hc;} private: diff --git a/TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h b/TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h index e37ba589b43f2..6ff5f3c48a4bd 100644 --- a/TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h +++ b/TrackingTools/TrackFitters/interface/KFTrajectorySmoother.h @@ -88,7 +88,7 @@ class KFTrajectorySmoother final : public TrajectorySmoother { } // FIXME a prototype: final inplementaiton may differ - virtual void setHitCloner(TkCloner const * hc) { theHitCloner = hc;} + virtual void setHitCloner(TkCloner const * hc) override { theHitCloner = hc;} private: diff --git a/TrackingTools/TrajectoryFiltering/interface/CkfBaseTrajectoryFilter.h b/TrackingTools/TrajectoryFiltering/interface/CkfBaseTrajectoryFilter.h index 71af4921425f4..b1a2dc88ffe97 100644 --- a/TrackingTools/TrajectoryFiltering/interface/CkfBaseTrajectoryFilter.h +++ b/TrackingTools/TrajectoryFiltering/interface/CkfBaseTrajectoryFilter.h @@ -44,13 +44,13 @@ class CkfBaseTrajectoryFilter : public TrajectoryFilter { theMaxCCCLostHitsTrajectoryFilter->setEvent(iEvent, iSetup); } - virtual bool qualityFilter( const Trajectory& traj) const {return QF(traj);} - virtual bool qualityFilter( const TempTrajectory& traj) const {return QF(traj);} + virtual bool qualityFilter( const Trajectory& traj) const override {return QF(traj);} + virtual bool qualityFilter( const TempTrajectory& traj) const override {return QF(traj);} - virtual bool toBeContinued( Trajectory& traj) const {return TBC(traj);} - virtual bool toBeContinued( TempTrajectory& traj) const {return TBC(traj);} + virtual bool toBeContinued( Trajectory& traj) const override {return TBC(traj);} + virtual bool toBeContinued( TempTrajectory& traj) const override {return TBC(traj);} - virtual std::string name() const { return "CkfBaseTrajectoryFilter";} + virtual std::string name() const override { return "CkfBaseTrajectoryFilter";} inline edm::ParameterSetDescription getFilledConfigurationDescription() { edm::ParameterSetDescription descLooper = theLooperTrajectoryFilter->getFilledConfigurationDescription(); diff --git a/TrackingTools/TrajectoryFiltering/interface/CompositeLogicalTrajectoryFilter.h b/TrackingTools/TrajectoryFiltering/interface/CompositeLogicalTrajectoryFilter.h index a3b6012ff383f..a539e74c982f1 100644 --- a/TrackingTools/TrajectoryFiltering/interface/CompositeLogicalTrajectoryFilter.h +++ b/TrackingTools/TrajectoryFiltering/interface/CompositeLogicalTrajectoryFilter.h @@ -40,13 +40,13 @@ class CompositeLogicalTrajectoryFilter : public TrajectoryFilter { } } - virtual bool qualityFilter( const Trajectory& traj) const { return QF(traj);} - virtual bool qualityFilter( const TempTrajectory& traj) const { return QF(traj);} + virtual bool qualityFilter( const Trajectory& traj) const override { return QF(traj);} + virtual bool qualityFilter( const TempTrajectory& traj) const override { return QF(traj);} - virtual bool toBeContinued( Trajectory& traj) const { return TBC(traj);} - virtual bool toBeContinued( TempTrajectory& traj) const { return TBC(traj);} + virtual bool toBeContinued( Trajectory& traj) const override { return TBC(traj);} + virtual bool toBeContinued( TempTrajectory& traj) const override { return TBC(traj);} - virtual std::string name() const {return "CompositeLogicalTrajectoryFilter";} + virtual std::string name() const override {return "CompositeLogicalTrajectoryFilter";} protected: template bool TBC( T& traj)const{ diff --git a/TrackingTools/TrajectoryFiltering/interface/CompositeTrajectoryFilter.h b/TrackingTools/TrajectoryFiltering/interface/CompositeTrajectoryFilter.h index 6c9422c8e7484..416e2932720fc 100644 --- a/TrackingTools/TrajectoryFiltering/interface/CompositeTrajectoryFilter.h +++ b/TrackingTools/TrajectoryFiltering/interface/CompositeTrajectoryFilter.h @@ -33,13 +33,13 @@ class CompositeTrajectoryFilter : public TrajectoryFilter { } } - virtual bool qualityFilter( const Trajectory& traj) const { return QF(traj);} - virtual bool qualityFilter( const TempTrajectory& traj) const { return QF(traj);} + virtual bool qualityFilter( const Trajectory& traj) const override{ return QF(traj);} + virtual bool qualityFilter( const TempTrajectory& traj) const override{ return QF(traj);} - virtual bool toBeContinued( Trajectory& traj) const { return TBC(traj);} - virtual bool toBeContinued( TempTrajectory& traj) const { return TBC(traj);} + virtual bool toBeContinued( Trajectory& traj) const override{ return TBC(traj);} + virtual bool toBeContinued( TempTrajectory& traj) const override{ return TBC(traj);} - virtual std::string name() const { std::string rname="CompositeTrajectoryFilter"; + virtual std::string name() const override{ std::string rname="CompositeTrajectoryFilter"; unsigned int i=0; unsigned int n=filters.size(); for (;iname();} diff --git a/TrackingTools/TransientTrackingRecHit/interface/GenericTransientTrackingRecHit.h b/TrackingTools/TransientTrackingRecHit/interface/GenericTransientTrackingRecHit.h index afad87d2bdcad..b843be1eea6a7 100644 --- a/TrackingTools/TransientTrackingRecHit/interface/GenericTransientTrackingRecHit.h +++ b/TrackingTools/TransientTrackingRecHit/interface/GenericTransientTrackingRecHit.h @@ -10,10 +10,10 @@ class GenericTransientTrackingRecHit: public TValidTrackingRecHit{ virtual ~GenericTransientTrackingRecHit() {delete trackingRecHit_;} - virtual AlgebraicVector parameters() const {return trackingRecHit_->parameters();} - virtual AlgebraicSymMatrix parametersError() const {return trackingRecHit_->parametersError();} - virtual AlgebraicMatrix projectionMatrix() const {return trackingRecHit_->projectionMatrix();} - virtual int dimension() const {return trackingRecHit_->dimension();} + virtual AlgebraicVector parameters() const override {return trackingRecHit_->parameters();} + virtual AlgebraicSymMatrix parametersError() const override {return trackingRecHit_->parametersError();} + virtual AlgebraicMatrix projectionMatrix() const override {return trackingRecHit_->projectionMatrix();} + virtual int dimension() const override {return trackingRecHit_->dimension();} // virtual void getKfComponents( KfComponentsHolder & holder ) const override { trackingRecHit_->getKfComponents(holder); } // NO, because someone might specialize parametersError, projectionMatrix or parameters in the transient rechit @@ -24,8 +24,8 @@ class GenericTransientTrackingRecHit: public TValidTrackingRecHit{ virtual bool canImproveWithTrack() const override {return false;} - virtual const TrackingRecHit * hit() const {return trackingRecHit_;} - TrackingRecHit * cloneHit() const { return hit()->clone();} + virtual const TrackingRecHit * hit() const override {return trackingRecHit_;} + TrackingRecHit * cloneHit() const override { return hit()->clone();} virtual std::vector recHits() const override { return ((const TrackingRecHit *)(trackingRecHit_))->recHits(); diff --git a/Validation/CSCRecHits/src/CSCRecHitValidation.h b/Validation/CSCRecHits/src/CSCRecHitValidation.h index 75b6f2d8cbb1e..14094a722ab8c 100644 --- a/Validation/CSCRecHits/src/CSCRecHitValidation.h +++ b/Validation/CSCRecHits/src/CSCRecHitValidation.h @@ -23,7 +23,7 @@ class CSCRecHitValidation : public DQMEDAnalyzer { explicit CSCRecHitValidation(const edm::ParameterSet&); ~CSCRecHitValidation(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; private: PSimHitMap theSimHitMap; diff --git a/Validation/CaloTowers/interface/CaloTowersClient.h b/Validation/CaloTowers/interface/CaloTowersClient.h index 55a2b1bc7cab4..05dd5a39dc4c3 100644 --- a/Validation/CaloTowers/interface/CaloTowersClient.h +++ b/Validation/CaloTowers/interface/CaloTowersClient.h @@ -52,7 +52,7 @@ class CaloTowersClient : public DQMEDHarvester { explicit CaloTowersClient(const edm::ParameterSet& ); virtual ~CaloTowersClient(); - virtual void beginJob(void); + virtual void beginJob(void) override; virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob int CaloTowersEndjob(const std::vector &hcalMEs); diff --git a/Validation/CaloTowers/interface/CaloTowersValidation.h b/Validation/CaloTowers/interface/CaloTowersValidation.h index aae3953f8f7dd..401e003648e7e 100644 --- a/Validation/CaloTowers/interface/CaloTowersValidation.h +++ b/Validation/CaloTowers/interface/CaloTowersValidation.h @@ -34,9 +34,9 @@ class CaloTowersValidation : public DQMEDAnalyzer { public: CaloTowersValidation(edm::ParameterSet const& conf); ~CaloTowersValidation(); - virtual void analyze(edm::Event const& e, edm::EventSetup const& c); - virtual void beginRun() ; - virtual void endRun() ; + virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override; + virtual void beginRun(); + virtual void endRun(); virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/Validation/EcalDigis/interface/EcalDigisValidation.h b/Validation/EcalDigis/interface/EcalDigisValidation.h index 670348fa2f01e..3bd87b4f98210 100644 --- a/Validation/EcalDigis/interface/EcalDigisValidation.h +++ b/Validation/EcalDigis/interface/EcalDigisValidation.h @@ -62,7 +62,7 @@ void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const protected: /// Analyze -void analyze(edm::Event const & e, edm::EventSetup const & c); +void analyze(edm::Event const & e, edm::EventSetup const & c) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; private: diff --git a/Validation/EcalDigis/interface/EcalEndcapDigisValidation.h b/Validation/EcalDigis/interface/EcalEndcapDigisValidation.h index bfeae9d00b609..2f490f8179d97 100644 --- a/Validation/EcalDigis/interface/EcalEndcapDigisValidation.h +++ b/Validation/EcalDigis/interface/EcalEndcapDigisValidation.h @@ -50,7 +50,7 @@ virtual void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSet protected: /// Analyze -void analyze(edm::Event const & e, edm::EventSetup const & c); +void analyze(edm::Event const & e, edm::EventSetup const & c) override; void checkCalibrations(edm::EventSetup const & c); diff --git a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h b/Validation/EcalDigis/interface/EcalMixingModuleValidation.h index 34c680d9ee72c..3f652a107af5b 100644 --- a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h +++ b/Validation/EcalDigis/interface/EcalMixingModuleValidation.h @@ -89,12 +89,12 @@ void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const protected: /// Analyze -void analyze(edm::Event const & e, edm::EventSetup const & c); +void analyze(edm::Event const & e, edm::EventSetup const & c) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; // EndRun -void endRun(const edm::Run& r, const edm::EventSetup& c); +void endRun(const edm::Run& r, const edm::EventSetup& c) override; private: diff --git a/Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h b/Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h index 592087bc740a8..fbec95fc8bb90 100644 --- a/Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h +++ b/Validation/EcalDigis/interface/EcalPreshowerDigisValidation.h @@ -46,7 +46,7 @@ void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const protected: /// Analyze -void analyze(const edm::Event& e, const edm::EventSetup& c); +void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h b/Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h index fdd9bda0ad1ef..f76884354297c 100644 --- a/Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h +++ b/Validation/EcalDigis/interface/EcalPreshowerNoiseDistrib.h @@ -39,7 +39,7 @@ void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const protected: /// Analyze -void analyze(const edm::Event& e, const edm::EventSetup& c); +void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h index 6c5e22e63cf94..8e20c9bc4b037 100644 --- a/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h +++ b/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h @@ -49,7 +49,7 @@ EcalBarrelRecHitsValidation(const edm::ParameterSet& ps); /// Analyze void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; -void analyze(const edm::Event& e, const edm::EventSetup& c); +void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h index 25ba176aa8bb4..06098ef3fe4a5 100644 --- a/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h +++ b/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h @@ -50,7 +50,7 @@ EcalEndcapRecHitsValidation(const edm::ParameterSet& ps); void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; /// Analyze -void analyze(const edm::Event& e, const edm::EventSetup& c); +void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h index 837a4d7400bda..b5fd1c1ff0ed6 100644 --- a/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h +++ b/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h @@ -46,7 +46,7 @@ class EcalPreshowerRecHitsValidation: public DQMEDAnalyzer{ void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: diff --git a/Validation/EcalRecHits/interface/EcalRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalRecHitsValidation.h index 94ea1ebafc4c0..143c48dfa1916 100644 --- a/Validation/EcalRecHits/interface/EcalRecHitsValidation.h +++ b/Validation/EcalRecHits/interface/EcalRecHitsValidation.h @@ -57,7 +57,7 @@ EcalRecHitsValidation(const edm::ParameterSet& ps); void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; /// Analyze -void analyze(const edm::Event& e, const edm::EventSetup& c); +void analyze(const edm::Event& e, const edm::EventSetup& c) override; uint32_t getUnitWithMaxEnergy(MapType& themap); void findBarrelMatrix(int nCellInEta, int nCellInPhi, diff --git a/Validation/EcalRecHits/interface/EcalTBValidation.h b/Validation/EcalRecHits/interface/EcalTBValidation.h index 4f52281f578aa..fb2f9c261024f 100644 --- a/Validation/EcalRecHits/interface/EcalTBValidation.h +++ b/Validation/EcalRecHits/interface/EcalTBValidation.h @@ -24,7 +24,7 @@ class EcalTBValidation : public DQMEDAnalyzer { ~EcalTBValidation(); void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; - virtual void analyze( const edm::Event&, const edm::EventSetup& ); + virtual void analyze( const edm::Event&, const edm::EventSetup& ) override; private: diff --git a/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h b/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h index 3b121a15f758f..44e6f6ab5aebc 100644 --- a/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h +++ b/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h @@ -116,7 +116,7 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer explicit GlobalDigisAnalyzer(const edm::ParameterSet&); virtual ~GlobalDigisAnalyzer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h b/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h index ec8564ecfa1f2..4744b645bfc35 100644 --- a/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h +++ b/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h @@ -60,7 +60,7 @@ class GlobalDigisHistogrammer : public DQMEDAnalyzer { explicit GlobalDigisHistogrammer(const edm::ParameterSet&); virtual ~GlobalDigisHistogrammer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h b/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h index 8db61e14a417d..8da02ea6ba800 100644 --- a/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h +++ b/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h @@ -80,7 +80,7 @@ class GlobalHitsAnalyzer : public DQMEDAnalyzer explicit GlobalHitsAnalyzer(const edm::ParameterSet&); virtual ~GlobalHitsAnalyzer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h b/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h index 95772252bda72..20641b14ecf3d 100644 --- a/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h +++ b/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h @@ -79,7 +79,7 @@ class GlobalHitsHistogrammer : public DQMEDAnalyzer { explicit GlobalHitsHistogrammer(const edm::ParameterSet&); virtual ~GlobalHitsHistogrammer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/GlobalHits/interface/GlobalHitsProducer.h b/Validation/GlobalHits/interface/GlobalHitsProducer.h index 5d3fd59176da8..f5a6150ac0f4d 100644 --- a/Validation/GlobalHits/interface/GlobalHitsProducer.h +++ b/Validation/GlobalHits/interface/GlobalHitsProducer.h @@ -81,8 +81,8 @@ class GlobalHitsProducer : public edm::EDProducer explicit GlobalHitsProducer(const edm::ParameterSet&); virtual ~GlobalHitsProducer(); - virtual void beginJob( void ); - virtual void endJob(); + virtual void beginJob( void ) override; + virtual void endJob() override; virtual void produce(edm::Event&, const edm::EventSetup&) override; private: diff --git a/Validation/GlobalHits/interface/GlobalHitsTester.h b/Validation/GlobalHits/interface/GlobalHitsTester.h index 77114608681ad..b0d2309cd4b80 100644 --- a/Validation/GlobalHits/interface/GlobalHitsTester.h +++ b/Validation/GlobalHits/interface/GlobalHitsTester.h @@ -80,7 +80,7 @@ class GlobalHitsTester : public DQMEDAnalyzer explicit GlobalHitsTester(const edm::ParameterSet&); virtual ~GlobalHitsTester(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h b/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h index 0f0ca9f5bcbcb..605487b5620c3 100644 --- a/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h +++ b/Validation/GlobalRecHits/interface/GlobalRecHitsAnalyzer.h @@ -148,7 +148,7 @@ class GlobalRecHitsAnalyzer : public DQMEDAnalyzer explicit GlobalRecHitsAnalyzer(const edm::ParameterSet&); virtual ~GlobalRecHitsAnalyzer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/GlobalRecHits/interface/GlobalRecHitsHistogrammer.h b/Validation/GlobalRecHits/interface/GlobalRecHitsHistogrammer.h index 20126a8bd423e..dd28f2bf5ff7f 100644 --- a/Validation/GlobalRecHits/interface/GlobalRecHitsHistogrammer.h +++ b/Validation/GlobalRecHits/interface/GlobalRecHitsHistogrammer.h @@ -62,7 +62,7 @@ class GlobalRecHitsHistogrammer : public DQMEDAnalyzer explicit GlobalRecHitsHistogrammer(const edm::ParameterSet&); virtual ~GlobalRecHitsHistogrammer(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/HGCalValidation/plugins/HGCGeometryValidation.cc b/Validation/HGCalValidation/plugins/HGCGeometryValidation.cc index 3dbd3a9b24e86..51bc7775d3cd0 100644 --- a/Validation/HGCalValidation/plugins/HGCGeometryValidation.cc +++ b/Validation/HGCalValidation/plugins/HGCGeometryValidation.cc @@ -47,9 +47,9 @@ class HGCGeometryValidation : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: - void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: edm::EDGetTokenT g4Token_; diff --git a/Validation/HGCalValidation/plugins/HGCalDigiValidation.h b/Validation/HGCalValidation/plugins/HGCalDigiValidation.h index 2826fdee65b33..3bc6759ba4919 100644 --- a/Validation/HGCalValidation/plugins/HGCalDigiValidation.h +++ b/Validation/HGCalValidation/plugins/HGCalDigiValidation.h @@ -56,9 +56,9 @@ class HGCalDigiValidation : public DQMEDAnalyzer { ~HGCalDigiValidation(); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: void fillDigiInfo(digiInfo& hinfo); diff --git a/Validation/HGCalValidation/plugins/HGCalHitValidation.cc b/Validation/HGCalValidation/plugins/HGCalHitValidation.cc index 8d3bba2cd535d..497740de19c40 100644 --- a/Validation/HGCalValidation/plugins/HGCalHitValidation.cc +++ b/Validation/HGCalValidation/plugins/HGCalHitValidation.cc @@ -68,9 +68,9 @@ class HGCalHitValidation : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: - void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: typedef std::tuple HGCHitTuple; diff --git a/Validation/HGCalValidation/plugins/HGCalRecHitValidation.h b/Validation/HGCalValidation/plugins/HGCalRecHitValidation.h index 40d5c6a9050af..beb1b315e04a6 100644 --- a/Validation/HGCalValidation/plugins/HGCalRecHitValidation.h +++ b/Validation/HGCalValidation/plugins/HGCalRecHitValidation.h @@ -63,9 +63,9 @@ class HGCalRecHitValidation : public DQMEDAnalyzer { ~HGCalRecHitValidation(); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: template diff --git a/Validation/HGCalValidation/plugins/HGCalSimHitValidation.h b/Validation/HGCalValidation/plugins/HGCalSimHitValidation.h index 385c8fe6d42dd..e487337221440 100644 --- a/Validation/HGCalValidation/plugins/HGCalSimHitValidation.h +++ b/Validation/HGCalValidation/plugins/HGCalSimHitValidation.h @@ -78,9 +78,9 @@ class HGCalSimHitValidation : public DQMEDAnalyzer { protected: - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: diff --git a/Validation/HGCalValidation/test/FTSimHitTest.cc b/Validation/HGCalValidation/test/FTSimHitTest.cc index 1e63520184489..4a9419485f661 100644 --- a/Validation/HGCalValidation/test/FTSimHitTest.cc +++ b/Validation/HGCalValidation/test/FTSimHitTest.cc @@ -42,7 +42,7 @@ class FTSimHitTest: public edm::one::EDAnalyzer HGCHitTuple; - virtual void beginJob(); - virtual void endJob(); + virtual void beginJob() override; + virtual void endJob() override; virtual void beginRun(edm::Run const&, edm::EventSetup const&) override; virtual void analyze(edm::Event const&, edm::EventSetup const&) override; virtual void endRun(edm::Run const&, edm::EventSetup const&) override {} diff --git a/Validation/HGCalValidation/test/HGCalBHValidation.cc b/Validation/HGCalValidation/test/HGCalBHValidation.cc index ff9f4ac794471..2aad76dbe5154 100644 --- a/Validation/HGCalValidation/test/HGCalBHValidation.cc +++ b/Validation/HGCalValidation/test/HGCalBHValidation.cc @@ -44,7 +44,7 @@ class HGCalBHValidation: public edm::one::EDAnalyzer eventTime_Token_; diff --git a/Validation/RPCRecHits/interface/RPCPointVsRecHit.h b/Validation/RPCRecHits/interface/RPCPointVsRecHit.h index 78d0725c5f047..99144d4702772 100644 --- a/Validation/RPCRecHits/interface/RPCPointVsRecHit.h +++ b/Validation/RPCRecHits/interface/RPCPointVsRecHit.h @@ -22,7 +22,7 @@ class RPCPointVsRecHit : public DQMEDAnalyzer RPCPointVsRecHit(const edm::ParameterSet& pset); ~RPCPointVsRecHit() {}; - void analyze(const edm::Event& event, const edm::EventSetup& eventSetup); + void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/Validation/RPCRecHits/interface/RPCRecHitValid.h b/Validation/RPCRecHits/interface/RPCRecHitValid.h index 87b9b5fddf4fe..e94e377e5924d 100644 --- a/Validation/RPCRecHits/interface/RPCRecHitValid.h +++ b/Validation/RPCRecHits/interface/RPCRecHitValid.h @@ -27,7 +27,7 @@ class RPCRecHitValid : public DQMEDAnalyzer RPCRecHitValid(const edm::ParameterSet& pset); ~RPCRecHitValid() {}; - void analyze(const edm::Event& event, const edm::EventSetup& eventSetup); + void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h b/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h index bdc04420d958a..b50778c131228 100644 --- a/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h +++ b/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h @@ -30,7 +30,7 @@ class BTagPerformanceAnalyzerMC : public DQMEDAnalyzer { ~BTagPerformanceAnalyzerMC(); - virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup); + virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; private: diff --git a/Validation/RecoEgamma/plugins/ElectronConversionRejectionValidator.h b/Validation/RecoEgamma/plugins/ElectronConversionRejectionValidator.h index f48e64e2fd60a..97df731cbdd4b 100644 --- a/Validation/RecoEgamma/plugins/ElectronConversionRejectionValidator.h +++ b/Validation/RecoEgamma/plugins/ElectronConversionRejectionValidator.h @@ -49,7 +49,7 @@ class ElectronConversionRejectionValidator : public DQMEDAnalyzer virtual ~ElectronConversionRejectionValidator(); - virtual void analyze( const edm::Event&, const edm::EventSetup& ) ; + virtual void analyze( const edm::Event&, const edm::EventSetup& ) override ; void bookHistograms(DQMStore::IBooker& bei, edm::Run const&, edm::EventSetup const&) override; diff --git a/Validation/RecoEgamma/plugins/ElectronMcMiniAODSignalValidator.h b/Validation/RecoEgamma/plugins/ElectronMcMiniAODSignalValidator.h index 10cc11fb62325..d033ff9ef68db 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcMiniAODSignalValidator.h +++ b/Validation/RecoEgamma/plugins/ElectronMcMiniAODSignalValidator.h @@ -23,7 +23,7 @@ class ElectronMcSignalValidatorMiniAOD : public ElectronDqmAnalyzerBase { bool isAncestor(const reco::Candidate * ancestor, const reco::Candidate * particle); private: - virtual void bookHistograms( DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) ; + virtual void bookHistograms( DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override ; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; // ----------member data --------------------------- diff --git a/Validation/RecoEgamma/plugins/TkConvValidator.h b/Validation/RecoEgamma/plugins/TkConvValidator.h index acd44a824b659..0cb7dd296d310 100644 --- a/Validation/RecoEgamma/plugins/TkConvValidator.h +++ b/Validation/RecoEgamma/plugins/TkConvValidator.h @@ -58,9 +58,9 @@ class TkConvValidator : public DQMEDAnalyzer virtual ~TkConvValidator(); - virtual void analyze( const edm::Event&, const edm::EventSetup& ) ; + virtual void analyze( const edm::Event&, const edm::EventSetup& ) override ; void bookHistograms( DQMStore::IBooker&, edm::Run const &, edm::EventSetup const &) override; - virtual void dqmBeginRun( edm::Run const & r, edm::EventSetup const & theEventSetup) ; + virtual void dqmBeginRun( edm::Run const & r, edm::EventSetup const & theEventSetup) override ; virtual void endRun (edm::Run& r, edm::EventSetup const & es); virtual void endJob() ; diff --git a/Validation/RecoHI/plugins/HiBasicGenTest.h b/Validation/RecoHI/plugins/HiBasicGenTest.h index bbc353ef732f3..41ca838038ba1 100644 --- a/Validation/RecoHI/plugins/HiBasicGenTest.h +++ b/Validation/RecoHI/plugins/HiBasicGenTest.h @@ -23,8 +23,8 @@ class HiBasicGenTest : public DQMEDAnalyzer public: explicit HiBasicGenTest(const edm::ParameterSet&); virtual ~HiBasicGenTest(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/RecoJets/plugins/JetTester.h b/Validation/RecoJets/plugins/JetTester.h index 5ebcce21ccf82..eda1def4895fc 100644 --- a/Validation/RecoJets/plugins/JetTester.h +++ b/Validation/RecoJets/plugins/JetTester.h @@ -46,7 +46,7 @@ class JetTester : public DQMEDAnalyzer { JetTester (const edm::ParameterSet&); ~JetTester(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/Validation/RecoMET/plugins/METTester.h b/Validation/RecoMET/plugins/METTester.h index 2ca03b822dba9..f568b94e7d575 100644 --- a/Validation/RecoMET/plugins/METTester.h +++ b/Validation/RecoMET/plugins/METTester.h @@ -55,7 +55,7 @@ class METTester: public DQMEDAnalyzer { explicit METTester(const edm::ParameterSet&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h b/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h index 1d48538fefc90..c125290e80ff7 100644 --- a/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h +++ b/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h @@ -52,7 +52,7 @@ class GlobalMuonMatchAnalyzer : public DQMEDAnalyzer { private: virtual void beginJob() ; // virtual void beginRun(const edm::Run&, const edm::EventSetup&) ; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; virtual void endJob() ; virtual void endRun() ; diff --git a/Validation/RecoMuon/src/MuonTrackAnalyzer.h b/Validation/RecoMuon/src/MuonTrackAnalyzer.h index db454921a4182..030d2e903ce0b 100644 --- a/Validation/RecoMuon/src/MuonTrackAnalyzer.h +++ b/Validation/RecoMuon/src/MuonTrackAnalyzer.h @@ -58,7 +58,7 @@ class MuonTrackAnalyzer: public DQMEDAnalyzer { // Operations - void analyze(const edm::Event & event, const edm::EventSetup& eventSetup); + void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override; void tracksAnalysis(const edm::Event & event, const edm::EventSetup& eventSetup, edm::Handle simTracks); void seedsAnalysis(const edm::Event & event, const edm::EventSetup& eventSetup, diff --git a/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h b/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h index 578f2153530f9..39e4bbf81d962 100644 --- a/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h +++ b/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h @@ -58,7 +58,7 @@ class MuonTrackResidualAnalyzer: public DQMEDAnalyzer { // Operations - void analyze(const edm::Event & event, const edm::EventSetup& eventSetup); + void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override; virtual void beginJob() ; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/Validation/RecoMuon/src/RecoMuonValidator.h b/Validation/RecoMuon/src/RecoMuonValidator.h index e6591e8678bd7..8073274753819 100644 --- a/Validation/RecoMuon/src/RecoMuonValidator.h +++ b/Validation/RecoMuon/src/RecoMuonValidator.h @@ -36,10 +36,10 @@ class RecoMuonValidator : public DQMEDAnalyzer RecoMuonValidator(const edm::ParameterSet& pset); ~RecoMuonValidator(); - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup& eventSetup); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup& eventSetup) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; virtual void endRun(); - virtual void analyze(const edm::Event& event, const edm::EventSetup& eventSetup); + virtual void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override; virtual int countMuonHits(const reco::Track& track) const; virtual int countTrackerHits(const reco::Track& track) const; diff --git a/Validation/RecoTau/interface/TauTagValidation.h b/Validation/RecoTau/interface/TauTagValidation.h index a7a9d91ba1870..275cf5b2487e7 100644 --- a/Validation/RecoTau/interface/TauTagValidation.h +++ b/Validation/RecoTau/interface/TauTagValidation.h @@ -76,8 +76,8 @@ class TauTagValidation : public DQMEDAnalyzer{ ~TauTagValidation(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + virtual void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; private: /// label of the current module