From e4e6f2c855c3d271003ec51174b9c507d4386e2b Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 29 Nov 2016 13:54:50 -0600 Subject: [PATCH] DQM: fix clang warnings about missing override keyword --- DQM/BeamMonitor/plugins/AlcaBeamMonitor.h | 12 +- .../plugins/AlcaBeamMonitorClient.h | 12 +- DQM/BeamMonitor/plugins/BeamMonitor.h | 12 +- DQM/BeamMonitor/plugins/BeamMonitorBx.h | 12 +- .../plugins/BeamSpotProblemMonitor.h | 12 +- DQM/BeamMonitor/plugins/TKStatus.h | 12 +- DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h | 6 +- .../plugins/CSCMonitorModule.h | 10 +- .../plugins/CSCOfflineClient.h | 4 +- DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc | 8 +- DQM/CTPPS/plugins/TotemRPDQMSource.cc | 8 +- .../src/DTChamberEfficiencyClient.h | 4 +- .../src/DTChamberEfficiencyTest.h | 2 +- DQM/DTMonitorClient/src/DTDCSSummary.h | 2 +- DQM/DTMonitorClient/src/DTDataIntegrityTest.h | 2 +- .../src/DTOfflineSummaryClients.h | 4 +- DQM/DTMonitorClient/src/DTResolutionTest.h | 2 +- .../src/DTRunConditionVarClient.h | 4 +- DQM/DTMonitorClient/src/DTSummaryClients.h | 2 +- DQM/DTMonitorModule/interface/DTDigiTask.h | 8 +- DQM/DTMonitorModule/src/DTChamberEfficiency.h | 4 +- .../src/DTChamberEfficiencyTask.h | 6 +- DQM/DTMonitorModule/src/DTDCSByLumiTask.h | 8 +- DQM/DTMonitorModule/src/DTEfficiencyTask.h | 6 +- .../src/DTLocalTriggerBaseTask.h | 8 +- .../src/DTLocalTriggerLutTask.h | 6 +- .../src/DTLocalTriggerSynchTask.h | 4 +- DQM/DTMonitorModule/src/DTLocalTriggerTask.h | 6 +- DQM/DTMonitorModule/src/DTNoiseTask.h | 8 +- .../src/DTResolutionAnalysisTask.h | 6 +- DQM/DTMonitorModule/src/DTRunConditionVar.h | 4 +- DQM/DTMonitorModule/src/DTScalerInfoTask.h | 8 +- .../src/DTSegmentAnalysisTask.h | 8 +- .../src/DTTriggerEfficiencyTask.h | 6 +- DQM/DataScouting/plugins/AlphaTVarAnalyzer.h | 2 +- DQM/DataScouting/plugins/DiJetVarAnalyzer.h | 2 +- .../plugins/ScoutingTestAnalyzer.h | 4 +- .../interface/RecoSummaryTask.h | 2 +- DQM/HLTEvF/plugins/DQMCorrelationClient.h | 4 +- DQM/HLTEvF/plugins/LumiMonitor.h | 2 +- DQM/HLTEvF/plugins/PSMonitor.h | 2 +- DQM/HLXMonitor/interface/HLXMonitor.h | 2 +- DQM/HcalCommon/interface/Container2D.h | 220 +++++++++--------- .../interface/ElectronicsQuantity.h | 2 +- DQM/L1TMonitor/interface/BxTiming.h | 4 +- DQM/L1TMonitor/interface/L1ExtraDQM.h | 8 +- DQM/L1TMonitor/interface/L1GtHwValidation.h | 6 +- DQM/L1TMonitor/interface/L1TBPTX.h | 8 +- DQM/L1TMonitor/interface/L1TCSCTPG.h | 6 +- DQM/L1TMonitor/interface/L1TCompare.h | 4 +- DQM/L1TMonitor/interface/L1TDEMON.h | 6 +- DQM/L1TMonitor/interface/L1TDTTF.h | 6 +- DQM/L1TMonitor/interface/L1TDTTPG.h | 6 +- DQM/L1TMonitor/interface/L1TFED.h | 2 +- DQM/L1TMonitor/interface/L1TGCT.h | 6 +- DQM/L1TMonitor/interface/L1THIonImp.h | 6 +- DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h | 4 +- DQM/L1TMonitor/interface/L1TPUM.h | 6 +- DQM/L1TMonitor/interface/L1TRCT.h | 6 +- DQM/L1TMonitor/interface/L1TRPCTF.h | 8 +- DQM/L1TMonitor/interface/L1TRPCTPG.h | 6 +- DQM/L1TMonitor/interface/L1TRate.h | 6 +- .../interface/L1TStage2CaloLayer1.h | 8 +- .../interface/L1TStage2CaloLayer2.h | 6 +- DQM/L1TMonitor/interface/L1TStage2EMTF.h | 4 +- DQM/L1TMonitor/interface/L1TStage2MuonComp.h | 4 +- .../interface/L1TStage2RegionalMuonCandComp.h | 4 +- DQM/L1TMonitor/interface/L1TStage2uGMT.h | 4 +- DQM/L1TMonitor/interface/L1TStage2uGT.h | 8 +- DQM/L1TMonitor/interface/L1TSync.h | 8 +- DQM/L1TMonitor/interface/L1TdeCSCTF.h | 6 +- DQM/L1TMonitor/interface/L1TdeGCT.h | 6 +- DQM/L1TMonitor/interface/L1TdeRCT.h | 6 +- .../interface/L1TdeStage2CaloLayer1.h | 6 +- DQM/L1TMonitor/interface/L1TdeStage2EMTF.h | 4 +- .../interface/L1EmulatorErrorFlagClient.h | 2 +- .../interface/L1TCSCTFClient.h | 2 +- .../interface/L1TDTTFClient.h | 2 +- .../interface/L1TEventInfoClient.h | 2 +- DQM/L1TMonitorClient/interface/L1TGCTClient.h | 2 +- DQM/L1TMonitorClient/interface/L1TGMTClient.h | 2 +- .../interface/L1TOccupancyClient.h | 2 +- .../interface/L1TRPCTFClient.h | 2 +- .../interface/L1TStage2CaloLayer2DEClient.h | 2 +- .../interface/L1TTestsSummary.h | 2 +- .../src/L1EmulatorErrorFlagClient.cc | 2 +- DQM/L1TMonitorClient/src/L1TCSCTFClient.cc | 2 +- DQM/Physics/src/B2GDQM.h | 2 +- DQM/Physics/src/BPhysicsOniaDQM.h | 2 +- DQM/Physics/src/EwkDQM.h | 4 +- DQM/Physics/src/EwkElecDQM.h | 6 +- DQM/Physics/src/EwkMuDQM.h | 6 +- DQM/Physics/src/EwkMuLumiMonitorDQM.h | 6 +- DQM/Physics/src/EwkTauDQM.h | 4 +- DQM/Physics/src/ExoticaDQM.h | 2 +- DQM/Physics/src/HiggsDQM.h | 8 +- DQM/Physics/src/QcdHighPtDQM.h | 2 +- DQM/Physics/src/QcdLowPtDQM.h | 8 +- DQM/Physics/src/QcdPhotonsDQM.h | 2 +- DQM/Physics/src/QcdUeDQM.h | 4 +- DQM/Physics/src/SingleTopTChannelLeptonDQM.h | 2 +- .../src/SingleTopTChannelLeptonDQM_miniAOD.h | 2 +- DQM/Physics/src/SusyDQM.h | 2 +- DQM/Physics/src/TopDiLeptonDQM.h | 2 +- DQM/Physics/src/TopDiLeptonOfflineDQM.h | 2 +- DQM/Physics/src/TopSingleLeptonDQM.h | 2 +- DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h | 2 +- .../interface/PhysicsObjectsMonitor.h | 2 +- DQM/PixelLumi/plugins/PixelLumiDQM.h | 10 +- .../interface/RPCChamberQuality.h | 4 +- .../interface/RPCDCSSummary.h | 4 +- DQM/RPCMonitorClient/interface/RPCDaqInfo.h | 4 +- .../interface/RPCDataCertification.h | 4 +- .../interface/RPCDcsInfoClient.h | 4 +- DQM/RPCMonitorClient/interface/RPCDqmClient.h | 4 +- .../interface/RPCEfficiencyPerRingLayer.h | 4 +- .../interface/RPCEfficiencySecond.h | 4 +- .../interface/RPCEfficiencyShiftHisto.h | 4 +- .../interface/RPCEventSummary.h | 4 +- .../interface/RPCFEDIntegrity.h | 2 +- .../interface/RPCMonitorLinkSynchro.h | 6 +- .../interface/RPCMonitorRaw.h | 2 +- .../interface/RPCRecHitProbabilityClient.h | 4 +- DQM/RPCMonitorDigi/interface/RPCDcsInfo.h | 4 +- DQM/RPCMonitorDigi/interface/RPCEfficiency.h | 2 +- DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h | 2 +- .../interface/RPCRecHitProbability.h | 2 +- DQM/RPCMonitorDigi/interface/RPCTTUMonitor.h | 2 +- .../interface/SiPixelEDAClient.h | 2 +- .../interface/SiPixelDigiSource.h | 4 +- .../interface/SiPixelHLTSource.h | 4 +- .../interface/SiPixelRawDataErrorSource.h | 4 +- .../interface/SiPixelRecHitSource.h | 4 +- .../plugins/tracking/ClusterCount.h | 2 +- .../interface/SiStripBaselineValidator.h | 2 +- .../interface/SiStripMonitorDigi.h | 10 +- .../src/SiStripCMMonitor.cc | 2 +- .../src/SiStripFEDDataCheck.cc | 4 +- .../src/SiStripFEDDump.cc | 2 +- .../src/SiStripSpyMonitorModule.cc | 2 +- .../interface/DQMScaleToClient.h | 4 +- 141 files changed, 432 insertions(+), 432 deletions(-) diff --git a/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h b/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h index 32c595c21733d..8a2d1d33d6189 100644 --- a/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h +++ b/DQM/BeamMonitor/plugins/AlcaBeamMonitor.h @@ -32,12 +32,12 @@ class AlcaBeamMonitor : public edm::EDAnalyzer { protected: - void beginJob (void); - void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup); - void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup); - void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); - void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); - void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup); + void beginJob (void) override; + void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override; + void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override; + void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override; + void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override; + void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override; void endJob (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); private: diff --git a/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h b/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h index 25a760cac4fb1..49482995c679b 100644 --- a/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h +++ b/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h @@ -28,12 +28,12 @@ class AlcaBeamMonitorClient : public edm::EDAnalyzer { protected: - void beginJob (void); - void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup); - void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup); - void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); - void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); - void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup); + void beginJob (void) override; + void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override; + void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override; + void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override; + void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override; + void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override; void endJob (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); private: diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.h b/DQM/BeamMonitor/plugins/BeamMonitor.h index 6a0aa67565bc8..5450e339b9594 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitor.h +++ b/DQM/BeamMonitor/plugins/BeamMonitor.h @@ -39,20 +39,20 @@ class BeamMonitor : public edm::EDAnalyzer { protected: // BeginJob - void beginJob(); + void beginJob() override; // BeginRun - void beginRun(const edm::Run& r, const edm::EventSetup& c); + void beginRun(const edm::Run& r, const edm::EventSetup& c) 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; // EndRun - void endRun(const edm::Run& r, const edm::EventSetup& c); + void endRun(const edm::Run& r, const edm::EventSetup& c) override; // Endjob void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c); diff --git a/DQM/BeamMonitor/plugins/BeamMonitorBx.h b/DQM/BeamMonitor/plugins/BeamMonitorBx.h index 9c85119a7a006..c6b0a9b77f5b5 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitorBx.h +++ b/DQM/BeamMonitor/plugins/BeamMonitorBx.h @@ -35,20 +35,20 @@ class BeamMonitorBx : public edm::EDAnalyzer { protected: // BeginJob - void beginJob(); + void beginJob() override; // BeginRun - void beginRun(const edm::Run& r, const edm::EventSetup& c); + void beginRun(const edm::Run& r, const edm::EventSetup& c) 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; // EndRun - void endRun(const edm::Run& r, const edm::EventSetup& c); + void endRun(const edm::Run& r, const edm::EventSetup& c) override; // Endjob void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c); diff --git a/DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.h b/DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.h index 91b249cc97c37..b045bce64e365 100644 --- a/DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.h +++ b/DQM/BeamMonitor/plugins/BeamSpotProblemMonitor.h @@ -41,17 +41,17 @@ class BeamSpotProblemMonitor : public edm::EDAnalyzer { // BeginJob - void beginJob(); + void beginJob() override; // BeginRun - void beginRun(const edm::Run& r, const edm::EventSetup& c); - void analyze(const edm::Event& e, const edm::EventSetup& c) ; + void beginRun(const edm::Run& r, const edm::EventSetup& c) override; + 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; // EndRun - void endRun(const edm::Run& r, const edm::EventSetup& c); + void endRun(const edm::Run& r, const edm::EventSetup& c) override; // Endjob void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c); diff --git a/DQM/BeamMonitor/plugins/TKStatus.h b/DQM/BeamMonitor/plugins/TKStatus.h index b10c7e2a5e4ae..f83a416755488 100644 --- a/DQM/BeamMonitor/plugins/TKStatus.h +++ b/DQM/BeamMonitor/plugins/TKStatus.h @@ -30,20 +30,20 @@ class TKStatus : public edm::EDAnalyzer { protected: // BeginJob - void beginJob(); + void beginJob() override; // BeginRun - void beginRun(const edm::Run& r, const edm::EventSetup& c); + void beginRun(const edm::Run& r, const edm::EventSetup& c) 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; // EndRun - void endRun(const edm::Run& r, const edm::EventSetup& c); + void endRun(const edm::Run& r, const edm::EventSetup& c) override; // Endjob void endJob(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c); diff --git a/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h b/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h index 2ff058feef453..6ca734e2c4c43 100644 --- a/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h +++ b/DQM/BeamMonitor/plugins/Vx3DHLTAnalyzer.h @@ -62,9 +62,9 @@ class Vx3DHLTAnalyzer : public DQMEDAnalyzer double Gauss3DFunc(const double* par); private: - void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup); - void beginLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup); - void endLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup); + void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override; + void beginLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup) override; + void endLuminosityBlock (const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup) override; void bookHistograms (DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; unsigned int HitCounter (const edm::Event& iEvent); diff --git a/DQM/CSCMonitorModule/plugins/CSCMonitorModule.h b/DQM/CSCMonitorModule/plugins/CSCMonitorModule.h index eb920e866516b..15ee2bedb444b 100644 --- a/DQM/CSCMonitorModule/plugins/CSCMonitorModule.h +++ b/DQM/CSCMonitorModule/plugins/CSCMonitorModule.h @@ -110,7 +110,7 @@ class CSCMonitorModule: public DQMEDAnalyzer, public cscdqm::MonitorObjectProvid public: - bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const { + bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const override { // Check parameter values if (crateId < MIN_CRATE_ID || crateId > MAX_CRATE_ID || dmbId < MIN_DMB_SLOT || dmbId > MAX_DMB_SLOT) { return false; @@ -119,7 +119,7 @@ class CSCMonitorModule: public DQMEDAnalyzer, public cscdqm::MonitorObjectProvid return (detId.rawId() != 0); } - cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req); + cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req) override; /** * EDAnalyzer Implementation @@ -130,9 +130,9 @@ class CSCMonitorModule: public DQMEDAnalyzer, public cscdqm::MonitorObjectProvid void beginJob() { } // void beginRun(const edm::Run& r, const edm::EventSetup& c); void setup() { } - void analyze(const edm::Event& e, const edm::EventSetup& c); - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) { } - void endRun(const edm::Run& r, 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) override { } + void endRun(const edm::Run& r, const edm::EventSetup& c) override { } void endJob() { } void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/CSCMonitorModule/plugins/CSCOfflineClient.h b/DQM/CSCMonitorModule/plugins/CSCOfflineClient.h index 32875ff4f8775..67136b8c24487 100644 --- a/DQM/CSCMonitorModule/plugins/CSCOfflineClient.h +++ b/DQM/CSCMonitorModule/plugins/CSCOfflineClient.h @@ -89,8 +89,8 @@ class CSCOfflineClient: public DQMEDHarvester, public cscdqm::MonitorObjectProvi public: - bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const { return false; } - cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req); + bool getCSCDetId(const unsigned int crateId, const unsigned int dmbId, CSCDetId& detId) const override{ return false; } + cscdqm::MonitorObject *bookMonitorObject (const cscdqm::HistoBookRequest& p_req) override; /** * EDAnalyzer Implementation diff --git a/DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc b/DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc index 097828cb2a746..653cef58e2666 100644 --- a/DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc +++ b/DQM/CTPPS/plugins/TotemDAQTriggerDQMSource.cc @@ -34,10 +34,10 @@ class TotemDAQTriggerDQMSource: 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: unsigned int verbosity; diff --git a/DQM/CTPPS/plugins/TotemRPDQMSource.cc b/DQM/CTPPS/plugins/TotemRPDQMSource.cc index f8ba95d0441d3..7ad6ec46510fd 100644 --- a/DQM/CTPPS/plugins/TotemRPDQMSource.cc +++ b/DQM/CTPPS/plugins/TotemRPDQMSource.cc @@ -45,10 +45,10 @@ class TotemRPDQMSource: 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: unsigned int verbosity; diff --git a/DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h b/DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h index 113571921cec0..36aea06aba3d9 100644 --- a/DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h +++ b/DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h @@ -51,13 +51,13 @@ class DTChamberEfficiencyClient: public DQMEDHarvester{ protected: - void beginRun(const edm::Run& , const edm::EventSetup&); + void beginRun(const edm::Run& , const edm::EventSetup&) override; void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; /// book the report summary void bookHistos(DQMStore::IBooker &); - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; private: diff --git a/DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h b/DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h index b6f793f693814..8b0f95654f611 100644 --- a/DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h +++ b/DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h @@ -65,7 +65,7 @@ class DTChamberEfficiencyTest: public DQMEDHarvester{ std::string getMEName(std::string histoTag, const DTChamberId & chID); /// DQM Client Diagnostic - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; diff --git a/DQM/DTMonitorClient/src/DTDCSSummary.h b/DQM/DTMonitorClient/src/DTDCSSummary.h index 53d4014885929..688268ddaa3d6 100644 --- a/DQM/DTMonitorClient/src/DTDCSSummary.h +++ b/DQM/DTMonitorClient/src/DTDCSSummary.h @@ -31,7 +31,7 @@ class DTDCSSummary : public DQMEDHarvester { // Operations void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, - edm::LuminosityBlock const &, edm::EventSetup const &); + edm::LuminosityBlock const &, edm::EventSetup const &) override; void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; diff --git a/DQM/DTMonitorClient/src/DTDataIntegrityTest.h b/DQM/DTMonitorClient/src/DTDataIntegrityTest.h index 77b76625832f9..26db96a917e56 100644 --- a/DQM/DTMonitorClient/src/DTDataIntegrityTest.h +++ b/DQM/DTMonitorClient/src/DTDataIntegrityTest.h @@ -45,7 +45,7 @@ class DTDataIntegrityTest: public DQMEDHarvester{ void bookHistos(DQMStore::IBooker &, std::string histoType, int dduId); /// DQM Client Diagnostic - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; private: int readOutToGeometry(int dduId, int rosNumber, int& wheel, int& sector); diff --git a/DQM/DTMonitorClient/src/DTOfflineSummaryClients.h b/DQM/DTMonitorClient/src/DTOfflineSummaryClients.h index c4b4e75eb6970..8ebc237c7a348 100644 --- a/DQM/DTMonitorClient/src/DTOfflineSummaryClients.h +++ b/DQM/DTMonitorClient/src/DTOfflineSummaryClients.h @@ -33,10 +33,10 @@ class DTOfflineSummaryClients: public DQMEDHarvester{ virtual ~DTOfflineSummaryClients(); /// BeginRun - void beginRun (const edm::Run& r, const edm::EventSetup& c); + void beginRun (const edm::Run& r, const edm::EventSetup& c) override; /// EndLumi - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; /// EndJob void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; diff --git a/DQM/DTMonitorClient/src/DTResolutionTest.h b/DQM/DTMonitorClient/src/DTResolutionTest.h index 316bdae1e1272..323c9e3eb86c4 100644 --- a/DQM/DTMonitorClient/src/DTResolutionTest.h +++ b/DQM/DTMonitorClient/src/DTResolutionTest.h @@ -67,7 +67,7 @@ class DTResolutionTest: public DQMEDHarvester{ std::string getMEName2D(const DTSuperLayerId & slID); /// DQM Client Diagnostic - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; private: diff --git a/DQM/DTMonitorClient/src/DTRunConditionVarClient.h b/DQM/DTMonitorClient/src/DTRunConditionVarClient.h index 95936e1a9a05a..a9ec358236f64 100644 --- a/DQM/DTMonitorClient/src/DTRunConditionVarClient.h +++ b/DQM/DTMonitorClient/src/DTRunConditionVarClient.h @@ -55,7 +55,7 @@ class DTRunConditionVarClient: public DQMEDHarvester{ /// Destructor virtual ~DTRunConditionVarClient(); - void beginRun(const edm::Run& r, const edm::EventSetup& c); + void beginRun(const edm::Run& r, const edm::EventSetup& c) override; protected: @@ -67,7 +67,7 @@ class DTRunConditionVarClient: public DQMEDHarvester{ int wh, int nbins, float min, float max, bool isVDCorr=false); /// DQM Client Diagnostic - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; float varQuality(float var, float maxGood, float minBad); diff --git a/DQM/DTMonitorClient/src/DTSummaryClients.h b/DQM/DTMonitorClient/src/DTSummaryClients.h index ff7d8d0750b1f..a3038f67b0312 100644 --- a/DQM/DTMonitorClient/src/DTSummaryClients.h +++ b/DQM/DTMonitorClient/src/DTSummaryClients.h @@ -47,7 +47,7 @@ class DTSummaryClients: public DQMEDHarvester{ void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; - void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &); + void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &) override; private: diff --git a/DQM/DTMonitorModule/interface/DTDigiTask.h b/DQM/DTMonitorModule/interface/DTDigiTask.h index 9cee9c92aa6b4..7f8b2514f022d 100644 --- a/DQM/DTMonitorModule/interface/DTDigiTask.h +++ b/DQM/DTMonitorModule/interface/DTDigiTask.h @@ -61,7 +61,7 @@ class DTDigiTask: public DQMEDAnalyzer{ protected: - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; // Book the histograms void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; @@ -73,14 +73,14 @@ class DTDigiTask: public DQMEDAnalyzer{ void bookHistos(DQMStore::IBooker & ibooker, const int wheelId, std::string folder, std::string histoTag); /// To reset the MEs - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ; - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup); + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override; + void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) override; /// To map real channels void channelsMap(const DTChamberId& dtCh, std::string histoTag); /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; /// get the L1A source diff --git a/DQM/DTMonitorModule/src/DTChamberEfficiency.h b/DQM/DTMonitorModule/src/DTChamberEfficiency.h index a28cfd6d7e4de..5001595251ff5 100644 --- a/DQM/DTMonitorModule/src/DTChamberEfficiency.h +++ b/DQM/DTMonitorModule/src/DTChamberEfficiency.h @@ -68,8 +68,8 @@ class DTChamberEfficiency : public DQMEDAnalyzer ~DTChamberEfficiency() ; //Operations - void analyze(const edm::Event & event, const edm::EventSetup& eventSetup); - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override; + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; protected: // Book the histograms diff --git a/DQM/DTMonitorModule/src/DTChamberEfficiencyTask.h b/DQM/DTMonitorModule/src/DTChamberEfficiencyTask.h index afbcfccd39133..6710f32ff41e1 100644 --- a/DQM/DTMonitorModule/src/DTChamberEfficiencyTask.h +++ b/DQM/DTMonitorModule/src/DTChamberEfficiencyTask.h @@ -49,13 +49,13 @@ class DTChamberEfficiencyTask: public DQMEDAnalyzer{ virtual ~DTChamberEfficiencyTask(); /// BeginRun - void dqmBeginRun(const edm::Run& run, const edm::EventSetup& setup); + void dqmBeginRun(const edm::Run& run, const edm::EventSetup& setup) override; /// To reset the MEs - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ; + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override; // Operations - void analyze(const edm::Event& event, const edm::EventSetup& setup); + void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: // Book the histograms diff --git a/DQM/DTMonitorModule/src/DTDCSByLumiTask.h b/DQM/DTMonitorModule/src/DTDCSByLumiTask.h index 5159143e775ec..7ef2f73ea4863 100644 --- a/DQM/DTMonitorModule/src/DTDCSByLumiTask.h +++ b/DQM/DTMonitorModule/src/DTDCSByLumiTask.h @@ -46,19 +46,19 @@ class DTDCSByLumiTask: public DQMEDAnalyzer{ protected: /// Begin Run - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; // Book the histograms void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; /// By Lumi DCS DB Operation - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ; + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override; /// By Lumi DCS DB Operation - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup); + void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) 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/DQM/DTMonitorModule/src/DTEfficiencyTask.h b/DQM/DTMonitorModule/src/DTEfficiencyTask.h index 9aa5bc76ce30a..47d696da2c456 100644 --- a/DQM/DTMonitorModule/src/DTEfficiencyTask.h +++ b/DQM/DTMonitorModule/src/DTEfficiencyTask.h @@ -44,15 +44,15 @@ class DTEfficiencyTask: public DQMEDAnalyzer{ virtual ~DTEfficiencyTask(); /// To reset the MEs - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ; + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override; // Operations - void analyze(const edm::Event& event, const edm::EventSetup& setup); + void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: /// BeginRun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; // Book the histograms void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.h b/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.h index 956c63f08b432..2717bd81cf4fe 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.h +++ b/DQM/DTMonitorModule/src/DTLocalTriggerBaseTask.h @@ -57,16 +57,16 @@ class DTLocalTriggerBaseTask: public DQMEDAnalyzer{ protected: ///Beginrun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; /// To reset the MEs - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override; /// Perform trend plot operations - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override; private: diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerLutTask.h b/DQM/DTMonitorModule/src/DTLocalTriggerLutTask.h index 0791535125a9a..a56bd9c13cec1 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerLutTask.h +++ b/DQM/DTMonitorModule/src/DTLocalTriggerLutTask.h @@ -56,16 +56,16 @@ class DTLocalTriggerLutTask: public DQMEDAnalyzer{ protected: ///BeginRun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; /// Find best (highest qual) TM trigger segments void searchDccBest(std::vector const* trigs); /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; /// To reset the MEs - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override ; private: diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerSynchTask.h b/DQM/DTMonitorModule/src/DTLocalTriggerSynchTask.h index e002e7c6937f9..82bad5c231cc3 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerSynchTask.h +++ b/DQM/DTMonitorModule/src/DTLocalTriggerSynchTask.h @@ -64,13 +64,13 @@ class DTLocalTriggerSynchTask: public DQMEDAnalyzer{ void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; ///Beginrun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; /// Book the histograms void bookHistos(DQMStore::IBooker &, const DTChamberId& dtCh ); /// Analyze - void analyze(const edm::Event& event, const edm::EventSetup& context); + void analyze(const edm::Event& event, const edm::EventSetup& context) override; std::string & baseDir() { return baseDirectory; } diff --git a/DQM/DTMonitorModule/src/DTLocalTriggerTask.h b/DQM/DTMonitorModule/src/DTLocalTriggerTask.h index 3eacda033fa76..475a64be34e67 100644 --- a/DQM/DTMonitorModule/src/DTLocalTriggerTask.h +++ b/DQM/DTMonitorModule/src/DTLocalTriggerTask.h @@ -60,7 +60,7 @@ class DTLocalTriggerTask: public DQMEDAnalyzer{ protected: ///Beginrun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; /// Book the histograms @@ -90,10 +90,10 @@ class DTLocalTriggerTask: public DQMEDAnalyzer{ void runDDUvsTMAnalysis(std::string& trigsrc); /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; /// To reset the MEs - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override ; /// Get the L1A source void triggerSource(const edm::Event& e); diff --git a/DQM/DTMonitorModule/src/DTNoiseTask.h b/DQM/DTMonitorModule/src/DTNoiseTask.h index 8dd1afc4f521b..fbf03958befe4 100644 --- a/DQM/DTMonitorModule/src/DTNoiseTask.h +++ b/DQM/DTMonitorModule/src/DTNoiseTask.h @@ -52,14 +52,14 @@ class DTNoiseTask : public DQMEDAnalyzer { protected: - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context); - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup); + void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override; + void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) 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/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.h b/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.h index 7182f321382b6..742f70c336e0c 100644 --- a/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.h +++ b/DQM/DTMonitorModule/src/DTResolutionAnalysisTask.h @@ -43,13 +43,13 @@ class DTResolutionAnalysisTask: public DQMEDAnalyzer{ void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; /// BeginRun - void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; /// To reset the MEs - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) ; + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override; // Operations - void analyze(const edm::Event& event, const edm::EventSetup& setup); + void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: diff --git a/DQM/DTMonitorModule/src/DTRunConditionVar.h b/DQM/DTMonitorModule/src/DTRunConditionVar.h index 0acfea509fb42..4e4c04de19d2c 100644 --- a/DQM/DTMonitorModule/src/DTRunConditionVar.h +++ b/DQM/DTMonitorModule/src/DTRunConditionVar.h @@ -56,8 +56,8 @@ class DTRunConditionVar : public DQMEDAnalyzer void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; //Operations - void analyze(const edm::Event & event, const edm::EventSetup& eventSetup); - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override; + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; private: diff --git a/DQM/DTMonitorModule/src/DTScalerInfoTask.h b/DQM/DTMonitorModule/src/DTScalerInfoTask.h index 7161f30c8e5a7..e2f1744b4962c 100644 --- a/DQM/DTMonitorModule/src/DTScalerInfoTask.h +++ b/DQM/DTMonitorModule/src/DTScalerInfoTask.h @@ -53,16 +53,16 @@ class DTScalerInfoTask: public DQMEDAnalyzer{ void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; ///Beginrun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; /// To reset the MEs - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override; /// Perform trend plot operations - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override; private: diff --git a/DQM/DTMonitorModule/src/DTSegmentAnalysisTask.h b/DQM/DTMonitorModule/src/DTSegmentAnalysisTask.h index dec3b16ab9a0f..33e3d7a5e29bf 100644 --- a/DQM/DTMonitorModule/src/DTSegmentAnalysisTask.h +++ b/DQM/DTMonitorModule/src/DTSegmentAnalysisTask.h @@ -51,14 +51,14 @@ class DTSegmentAnalysisTask: public DQMEDAnalyzer{ virtual ~DTSegmentAnalysisTask(); /// BeginRun - void dqmBeginRun(const edm::Run& , const edm::EventSetup&); + void dqmBeginRun(const edm::Run& , const edm::EventSetup&) override; // Operations - void analyze(const edm::Event& event, const edm::EventSetup& setup); + void analyze(const edm::Event& event, const edm::EventSetup& setup) override; /// Summary - void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup); - void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup); + void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override; + void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override; protected: diff --git a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h index f72e59ef98bb3..a7d05a59763b8 100644 --- a/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h +++ b/DQM/DTMonitorModule/src/DTTriggerEfficiencyTask.h @@ -55,7 +55,7 @@ class DTTriggerEfficiencyTask: public DQMEDAnalyzer{ protected: /// BeginRun - 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; @@ -72,10 +72,10 @@ class DTTriggerEfficiencyTask: public DQMEDAnalyzer{ std::string topFolder(std::string source) { return source=="TM" ? "DT/03-LocalTrigger-TM/" : "DT/04-LocalTrigger-DDU/"; } /// Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); + void analyze(const edm::Event& e, const edm::EventSetup& c) override; /// To reset the MEs - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) ; + void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) override; private: diff --git a/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h b/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h index 2ec2053d67969..dcc1328badc5f 100644 --- a/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h +++ b/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h @@ -8,7 +8,7 @@ class AlphaTVarAnalyzer : public ScoutingAnalyzerBase { explicit AlphaTVarAnalyzer( const edm::ParameterSet & ) ; virtual ~AlphaTVarAnalyzer() ; 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_jetCollectionTag; edm::InputTag m_alphaTVarCollectionTag; diff --git a/DQM/DataScouting/plugins/DiJetVarAnalyzer.h b/DQM/DataScouting/plugins/DiJetVarAnalyzer.h index 1465c5f5e7c05..085654cb1e6af 100644 --- a/DQM/DataScouting/plugins/DiJetVarAnalyzer.h +++ b/DQM/DataScouting/plugins/DiJetVarAnalyzer.h @@ -16,7 +16,7 @@ class DiJetVarAnalyzer : public ScoutingAnalyzerBase { explicit DiJetVarAnalyzer( const edm::ParameterSet & ) ; virtual ~DiJetVarAnalyzer() ; 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 jetCollectionTag_; edm::InputTag widejetsCollectionTag_; diff --git a/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h b/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h index 2408b2cc49326..8d74aad67bfee 100644 --- a/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h +++ b/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h @@ -10,8 +10,8 @@ class ScoutingTestAnalyzer : public ScoutingAnalyzerBase { explicit ScoutingTestAnalyzer( const edm::ParameterSet & ) ; virtual ~ScoutingTestAnalyzer() ; 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 &, edm::EventSetup const & ) ; + virtual void analyze( const edm::Event & , const edm::EventSetup & ) override; + virtual void endRun( edm::Run const &, edm::EventSetup const & ) override ; private: // histograms edm::InputTag m_pfJetsCollectionTag; diff --git a/DQM/EcalMonitorTasks/interface/RecoSummaryTask.h b/DQM/EcalMonitorTasks/interface/RecoSummaryTask.h index 515191b4d6c5e..8399c60ffa339 100644 --- a/DQM/EcalMonitorTasks/interface/RecoSummaryTask.h +++ b/DQM/EcalMonitorTasks/interface/RecoSummaryTask.h @@ -20,7 +20,7 @@ namespace ecaldqm { void addDependencies(DependencySet&) override; bool analyze(void const*, Collections) override; - void endEvent(edm::Event const&, edm::EventSetup const&); + void endEvent(edm::Event const&, edm::EventSetup const&) override; void runOnRecHits(EcalRecHitCollection const&, Collections); void runOnReducedRecHits(EcalRecHitCollection const&, Collections); diff --git a/DQM/HLTEvF/plugins/DQMCorrelationClient.h b/DQM/HLTEvF/plugins/DQMCorrelationClient.h index 4a7400fc8b938..c33947b962de1 100644 --- a/DQM/HLTEvF/plugins/DQMCorrelationClient.h +++ b/DQM/HLTEvF/plugins/DQMCorrelationClient.h @@ -46,8 +46,8 @@ class DQMCorrelationClient: 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/DQM/HLTEvF/plugins/LumiMonitor.h b/DQM/HLTEvF/plugins/LumiMonitor.h index 5f1c2a5c84b1e..43469de790b90 100644 --- a/DQM/HLTEvF/plugins/LumiMonitor.h +++ b/DQM/HLTEvF/plugins/LumiMonitor.h @@ -49,7 +49,7 @@ class LumiMonitor : public DQMEDAnalyzer protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - 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/HLTEvF/plugins/PSMonitor.h b/DQM/HLTEvF/plugins/PSMonitor.h index 76e21c1daca4b..e678c7fc259bd 100644 --- a/DQM/HLTEvF/plugins/PSMonitor.h +++ b/DQM/HLTEvF/plugins/PSMonitor.h @@ -53,7 +53,7 @@ class PSMonitor : public DQMEDAnalyzer protected: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - 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/HLXMonitor/interface/HLXMonitor.h b/DQM/HLXMonitor/interface/HLXMonitor.h index a7a4632f7efeb..dea51707d7618 100755 --- a/DQM/HLXMonitor/interface/HLXMonitor.h +++ b/DQM/HLXMonitor/interface/HLXMonitor.h @@ -55,7 +55,7 @@ class HLXMonitor : 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; void connectHLXTCP(); diff --git a/DQM/HcalCommon/interface/Container2D.h b/DQM/HcalCommon/interface/Container2D.h index 6a92ba97a2d53..a14e178e50822 100644 --- a/DQM/HcalCommon/interface/Container2D.h +++ b/DQM/HcalCommon/interface/Container2D.h @@ -42,140 +42,140 @@ namespace hcaldqm int debug=0); // redeclare what to override - virtual void fill(HcalDetId const&); - virtual void fill(HcalDetId const&, int); - virtual void fill(HcalDetId const&, double); - virtual void fill(HcalDetId const&, int, double); - virtual void fill(HcalDetId const&, int, int); - virtual void fill(HcalDetId const&, double, double); - - virtual double getBinEntries(HcalDetId const&); - virtual double getBinEntries(HcalDetId const&, int); - virtual double getBinEntries(HcalDetId const&, double); - virtual double getBinEntries(HcalDetId const&, int, int); - virtual double getBinEntries(HcalDetId const&, int, double); - virtual double getBinEntries(HcalDetId const&, double, double); - - virtual double getBinContent(HcalDetId const&); - virtual double getBinContent(HcalDetId const&, int); - virtual double getBinContent(HcalDetId const&, double); - virtual double getBinContent(HcalDetId const&, int, int); - virtual double getBinContent(HcalDetId const&, int, double); - virtual double getBinContent(HcalDetId const&, double, double); - - virtual void setBinContent(HcalDetId const&, int); - virtual void setBinContent(HcalDetId const&, double); - virtual void setBinContent(HcalDetId const&, int, int); - virtual void setBinContent(HcalDetId const&, int, double); - virtual void setBinContent(HcalDetId const&, double, int); - virtual void setBinContent(HcalDetId const&, double, double); - virtual void setBinContent(HcalDetId const&, int, int, int); - virtual void setBinContent(HcalDetId const&, int, double, int); - virtual void setBinContent(HcalDetId const&, double, int, int); - virtual void setBinContent(HcalDetId const&, double, double, int); - virtual void setBinContent(HcalDetId const&, int, int, double); - virtual void setBinContent(HcalDetId const&, int, double, double); - virtual void setBinContent(HcalDetId const&, double, int, double); + virtual void fill(HcalDetId const&) override ; + virtual void fill(HcalDetId const&, int) override; + virtual void fill(HcalDetId const&, double) override; + virtual void fill(HcalDetId const&, int, double) override; + virtual void fill(HcalDetId const&, int, int) override; + virtual void fill(HcalDetId const&, double, double) override; + + virtual double getBinEntries(HcalDetId const&) override; + virtual double getBinEntries(HcalDetId const&, int) override; + virtual double getBinEntries(HcalDetId const&, double) override; + virtual double getBinEntries(HcalDetId const&, int, int) override; + virtual double getBinEntries(HcalDetId const&, int, double) override; + virtual double getBinEntries(HcalDetId const&, double, double) override; + + virtual double getBinContent(HcalDetId const&) override; + virtual double getBinContent(HcalDetId const&, int) override; + virtual double getBinContent(HcalDetId const&, double) override; + virtual double getBinContent(HcalDetId const&, int, int) override; + virtual double getBinContent(HcalDetId const&, int, double) override; + virtual double getBinContent(HcalDetId const&, double, double) override; + + virtual void setBinContent(HcalDetId const&, int) override; + virtual void setBinContent(HcalDetId const&, double) override; + virtual void setBinContent(HcalDetId const&, int, int) override; + virtual void setBinContent(HcalDetId const&, int, double) override; + virtual void setBinContent(HcalDetId const&, double, int) override; + virtual void setBinContent(HcalDetId const&, double, double) override; + virtual void setBinContent(HcalDetId const&, int, int, int) override; + virtual void setBinContent(HcalDetId const&, int, double, int) override; + virtual void setBinContent(HcalDetId const&, double, int, int) override; + virtual void setBinContent(HcalDetId const&, double, double, int) override; + virtual void setBinContent(HcalDetId const&, int, int, double) override; + virtual void setBinContent(HcalDetId const&, int, double, double) override; + virtual void setBinContent(HcalDetId const&, double, int, double) override; virtual void setBinContent(HcalDetId const&, double, double, - double); - - virtual void fill(HcalElectronicsId const&); - virtual void fill(HcalElectronicsId const&, int); - virtual void fill(HcalElectronicsId const&, double); - virtual void fill(HcalElectronicsId const&, int, double); - virtual void fill(HcalElectronicsId const&, int, int); - virtual void fill(HcalElectronicsId const&, double, double); - - virtual double getBinEntries(HcalElectronicsId const&); - virtual double getBinEntries(HcalElectronicsId const&, int); - virtual double getBinEntries(HcalElectronicsId const&, double); - virtual double getBinEntries(HcalElectronicsId const&, int, int); - virtual double getBinEntries(HcalElectronicsId const&, int, double); + double) override; + + virtual void fill(HcalElectronicsId const&) override; + virtual void fill(HcalElectronicsId const&, int) override; + virtual void fill(HcalElectronicsId const&, double) override; + virtual void fill(HcalElectronicsId const&, int, double) override; + virtual void fill(HcalElectronicsId const&, int, int) override; + virtual void fill(HcalElectronicsId const&, double, double) override; + + virtual double getBinEntries(HcalElectronicsId const&) override; + virtual double getBinEntries(HcalElectronicsId const&, int) override; + virtual double getBinEntries(HcalElectronicsId const&, double) override; + virtual double getBinEntries(HcalElectronicsId const&, int, int) override; + virtual double getBinEntries(HcalElectronicsId const&, int, double) override; virtual double getBinEntries(HcalElectronicsId const&, double, - double); + double) override; - virtual double getBinContent(HcalElectronicsId const&); - virtual double getBinContent(HcalElectronicsId const&, int); - virtual double getBinContent(HcalElectronicsId const&, double); - virtual double getBinContent(HcalElectronicsId const&, int, int); - virtual double getBinContent(HcalElectronicsId const&, int, double); + virtual double getBinContent(HcalElectronicsId const&) override; + virtual double getBinContent(HcalElectronicsId const&, int) override; + virtual double getBinContent(HcalElectronicsId const&, double) override; + virtual double getBinContent(HcalElectronicsId const&, int, int) override; + virtual double getBinContent(HcalElectronicsId const&, int, double) override; virtual double getBinContent(HcalElectronicsId const&, double, - double); - - virtual void setBinContent(HcalElectronicsId const&, int); - virtual void setBinContent(HcalElectronicsId const&, double); - virtual void setBinContent(HcalElectronicsId const&, int, int); - virtual void setBinContent(HcalElectronicsId const&, int, double); - virtual void setBinContent(HcalElectronicsId const&, double, int); - virtual void setBinContent(HcalElectronicsId const&, double, double); - virtual void setBinContent(HcalElectronicsId const&, int, int, int); - virtual void setBinContent(HcalElectronicsId const&, int, double, int); - virtual void setBinContent(HcalElectronicsId const&, double, int, int); - virtual void setBinContent(HcalElectronicsId const&, double, double, int); - virtual void setBinContent(HcalElectronicsId const&, int, int, double); - virtual void setBinContent(HcalElectronicsId const&, int, double, double); - virtual void setBinContent(HcalElectronicsId const&, double, int, double); + double) override; + + virtual void setBinContent(HcalElectronicsId const&, int) override; + virtual void setBinContent(HcalElectronicsId const&, double) override; + virtual void setBinContent(HcalElectronicsId const&, int, int) override; + virtual void setBinContent(HcalElectronicsId const&, int, double) override; + virtual void setBinContent(HcalElectronicsId const&, double, int) override; + virtual void setBinContent(HcalElectronicsId const&, double, double) override; + virtual void setBinContent(HcalElectronicsId const&, int, int, int) override; + virtual void setBinContent(HcalElectronicsId const&, int, double, int) override; + virtual void setBinContent(HcalElectronicsId const&, double, int, int) override; + virtual void setBinContent(HcalElectronicsId const&, double, double, int) override; + virtual void setBinContent(HcalElectronicsId const&, int, int, double) override; + virtual void setBinContent(HcalElectronicsId const&, int, double, double) override; + virtual void setBinContent(HcalElectronicsId const&, double, int, double) override; virtual void setBinContent(HcalElectronicsId const&, double, double, - double); - - virtual void fill(HcalTrigTowerDetId const&); - virtual void fill(HcalTrigTowerDetId const&, int); - virtual void fill(HcalTrigTowerDetId const&, double); - virtual void fill(HcalTrigTowerDetId const&, int, int); - virtual void fill(HcalTrigTowerDetId const&, int, double); - virtual void fill(HcalTrigTowerDetId const&, double, double); - - virtual double getBinEntries(HcalTrigTowerDetId const&); - virtual double getBinEntries(HcalTrigTowerDetId const&, int); - virtual double getBinEntries(HcalTrigTowerDetId const&, double); - virtual double getBinEntries(HcalTrigTowerDetId const&, int, int); + double) override; + + virtual void fill(HcalTrigTowerDetId const&) override; + virtual void fill(HcalTrigTowerDetId const&, int) override; + virtual void fill(HcalTrigTowerDetId const&, double) override; + virtual void fill(HcalTrigTowerDetId const&, int, int) override; + virtual void fill(HcalTrigTowerDetId const&, int, double) override; + virtual void fill(HcalTrigTowerDetId const&, double, double) override; + + virtual double getBinEntries(HcalTrigTowerDetId const&) override; + virtual double getBinEntries(HcalTrigTowerDetId const&, int) override; + virtual double getBinEntries(HcalTrigTowerDetId const&, double) override; + virtual double getBinEntries(HcalTrigTowerDetId const&, int, int) override; virtual double getBinEntries(HcalTrigTowerDetId const&, int, - double); + double) override; virtual double getBinEntries(HcalTrigTowerDetId const&, - double, double); + double, double) override; - virtual double getBinContent(HcalTrigTowerDetId const&); - virtual double getBinContent(HcalTrigTowerDetId const&, int); - virtual double getBinContent(HcalTrigTowerDetId const&, double); - virtual double getBinContent(HcalTrigTowerDetId const&, int, int); - virtual double getBinContent(HcalTrigTowerDetId const&, int, double); + virtual double getBinContent(HcalTrigTowerDetId const&) override; + virtual double getBinContent(HcalTrigTowerDetId const&, int) override; + virtual double getBinContent(HcalTrigTowerDetId const&, double) override; + virtual double getBinContent(HcalTrigTowerDetId const&, int, int) override; + virtual double getBinContent(HcalTrigTowerDetId const&, int, double) override; virtual double getBinContent(HcalTrigTowerDetId const&, - double, double); - - virtual void setBinContent(HcalTrigTowerDetId const&, int); - virtual void setBinContent(HcalTrigTowerDetId const&, double); - virtual void setBinContent(HcalTrigTowerDetId const&, int, int); - virtual void setBinContent(HcalTrigTowerDetId const&, int, double); - virtual void setBinContent(HcalTrigTowerDetId const&, double, int); - virtual void setBinContent(HcalTrigTowerDetId const&, double, double); - virtual void setBinContent(HcalTrigTowerDetId const&, int, int, int); - virtual void setBinContent(HcalTrigTowerDetId const&, int, double, int); - virtual void setBinContent(HcalTrigTowerDetId const&, double, int, int); - virtual void setBinContent(HcalTrigTowerDetId const&, double, double, int); - virtual void setBinContent(HcalTrigTowerDetId const&, int, int, double); - virtual void setBinContent(HcalTrigTowerDetId const&, int, double, double); - virtual void setBinContent(HcalTrigTowerDetId const&, double, int, double); + double, double) override; + + virtual void setBinContent(HcalTrigTowerDetId const&, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, double) override; + virtual void setBinContent(HcalTrigTowerDetId const&, int, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, int, double) override; + virtual void setBinContent(HcalTrigTowerDetId const&, double, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, double, double) override; + virtual void setBinContent(HcalTrigTowerDetId const&, int, int, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, int, double, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, double, int, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, double, double, int) override; + virtual void setBinContent(HcalTrigTowerDetId const&, int, int, double) override; + virtual void setBinContent(HcalTrigTowerDetId const&, int, double, double) override; + virtual void setBinContent(HcalTrigTowerDetId const&, double, int, double) override; virtual void setBinContent(HcalTrigTowerDetId const&, double, double, - double); + double) override; // booking. see Container1D.h virtual void book(DQMStore::IBooker&, HcalElectronicsMap const*, - std::string subsystem="Hcal", std::string aux=""); + std::string subsystem="Hcal", std::string aux="") override; virtual void book(DQMStore::IBooker&, HcalElectronicsMap const*, filter::HashFilter const&, - std::string subsystem="Hcal", std::string aux=""); + std::string subsystem="Hcal", std::string aux="") override; virtual void book(DQMStore*, HcalElectronicsMap const*, - std::string subsystem="Hcal", std::string aux=""); + std::string subsystem="Hcal", std::string aux="") override; virtual void book(DQMStore*, HcalElectronicsMap const*, filter::HashFilter const&, - std::string subsystem="Hcal", std::string aux=""); + std::string subsystem="Hcal", std::string aux="") override; protected: Quantity *_qz; - virtual void customize(MonitorElement*); + virtual void customize(MonitorElement*) override; }; } diff --git a/DQM/HcalCommon/interface/ElectronicsQuantity.h b/DQM/HcalCommon/interface/ElectronicsQuantity.h index d6f9f56917879..427dc16758f71 100644 --- a/DQM/HcalCommon/interface/ElectronicsQuantity.h +++ b/DQM/HcalCommon/interface/ElectronicsQuantity.h @@ -1,5 +1,5 @@ #ifndef ElectronicsQuantity_h -#define ElectronicsQauntity_h +#define ElectronicsQuantity_h /** * file: ElectronicsQuantity.h diff --git a/DQM/L1TMonitor/interface/BxTiming.h b/DQM/L1TMonitor/interface/BxTiming.h index 269883ec53f40..27e8f974407fe 100644 --- a/DQM/L1TMonitor/interface/BxTiming.h +++ b/DQM/L1TMonitor/interface/BxTiming.h @@ -40,8 +40,8 @@ class BxTiming : public DQMEDAnalyzer { protected: - virtual void dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& iSetup); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; private: diff --git a/DQM/L1TMonitor/interface/L1ExtraDQM.h b/DQM/L1TMonitor/interface/L1ExtraDQM.h index 200e90539de5d..2b431ef9eeee8 100644 --- a/DQM/L1TMonitor/interface/L1ExtraDQM.h +++ b/DQM/L1TMonitor/interface/L1ExtraDQM.h @@ -168,10 +168,10 @@ class L1ExtraDQM : public DQMEDAnalyzer { void analyzeL1ExtraHfRingEtSums(const edm::Event&, const edm::EventSetup&); virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endRun(const edm::Run& run, const edm::EventSetup& evSetup); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(const edm::Run& run, const edm::EventSetup& evSetup) override; private: diff --git a/DQM/L1TMonitor/interface/L1GtHwValidation.h b/DQM/L1TMonitor/interface/L1GtHwValidation.h index 4e3bbb899e752..e228240c82dde 100644 --- a/DQM/L1TMonitor/interface/L1GtHwValidation.h +++ b/DQM/L1TMonitor/interface/L1GtHwValidation.h @@ -108,13 +108,13 @@ class L1GtHwValidation: public DQMEDAnalyzer { /// exclusion status for algorithm with bit i bool excludedAlgo(const int&) const; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; protected: virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; //virtual void analyze(DQMStore::IBooker &ibooker, const edm::Event&, const edm::EventSetup&); private: diff --git a/DQM/L1TMonitor/interface/L1TBPTX.h b/DQM/L1TMonitor/interface/L1TBPTX.h index ec40a45655b6f..fa1799a144c28 100644 --- a/DQM/L1TMonitor/interface/L1TBPTX.h +++ b/DQM/L1TMonitor/interface/L1TBPTX.h @@ -114,12 +114,12 @@ class L1TBPTX : 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&, const edm::EventSetup&) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) 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 beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; + virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; // Private Methods diff --git a/DQM/L1TMonitor/interface/L1TCSCTPG.h b/DQM/L1TMonitor/interface/L1TCSCTPG.h index 2c91fc3d4f9d7..1eeb0df28a5dc 100755 --- a/DQM/L1TMonitor/interface/L1TCSCTPG.h +++ b/DQM/L1TMonitor/interface/L1TCSCTPG.h @@ -51,9 +51,9 @@ virtual ~L1TCSCTPG(); protected: // Analyze - void analyze(const edm::Event& e, const edm::EventSetup& c); - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, 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&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; private: diff --git a/DQM/L1TMonitor/interface/L1TCompare.h b/DQM/L1TMonitor/interface/L1TCompare.h index 5ffd42bf63663..11757caabc643 100644 --- a/DQM/L1TMonitor/interface/L1TCompare.h +++ b/DQM/L1TMonitor/interface/L1TCompare.h @@ -77,11 +77,11 @@ class L1TCompare : 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; // BeginRun virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; private: // ----------member data --------------------------- diff --git a/DQM/L1TMonitor/interface/L1TDEMON.h b/DQM/L1TMonitor/interface/L1TDEMON.h index 79346bb6e9481..3f7600f65bc22 100644 --- a/DQM/L1TMonitor/interface/L1TDEMON.h +++ b/DQM/L1TMonitor/interface/L1TDEMON.h @@ -38,9 +38,9 @@ class L1TDEMON : public DQMEDAnalyzer { //virtual void beginJob(void) ; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); - virtual void analyze(const edm::Event&, 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 analyze(const edm::Event&, const edm::EventSetup&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TDTTF.h b/DQM/L1TMonitor/interface/L1TDTTF.h index 82b004b889083..9b133f561106c 100755 --- a/DQM/L1TMonitor/interface/L1TDTTF.h +++ b/DQM/L1TMonitor/interface/L1TDTTF.h @@ -40,11 +40,11 @@ class L1TDTTF : 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; // BeginJob - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; + virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; virtual void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TDTTPG.h b/DQM/L1TMonitor/interface/L1TDTTPG.h index 2fcb87d53fc57..0d8ba844d3098 100755 --- a/DQM/L1TMonitor/interface/L1TDTTPG.h +++ b/DQM/L1TMonitor/interface/L1TDTTPG.h @@ -48,12 +48,12 @@ class L1TDTTPG : 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; // BeginRun virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; + virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TFED.h b/DQM/L1TMonitor/interface/L1TFED.h index 9e6b8ef887dc3..1a93f0020ac2f 100755 --- a/DQM/L1TMonitor/interface/L1TFED.h +++ b/DQM/L1TMonitor/interface/L1TFED.h @@ -50,7 +50,7 @@ virtual ~L1TFED(); protected: // Analyze -void analyze(const edm::Event& e, const edm::EventSetup& c); +void analyze(const edm::Event& e, const edm::EventSetup& c) override; // BeginRun void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/L1TMonitor/interface/L1TGCT.h b/DQM/L1TMonitor/interface/L1TGCT.h index c637b132de9d6..8d018a40a94ea 100755 --- a/DQM/L1TMonitor/interface/L1TGCT.h +++ b/DQM/L1TMonitor/interface/L1TGCT.h @@ -133,11 +133,11 @@ class L1TGCT : 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; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: // ----------member data --------------------------- diff --git a/DQM/L1TMonitor/interface/L1THIonImp.h b/DQM/L1TMonitor/interface/L1THIonImp.h index f65c76d39f732..0f0e689e71d2e 100644 --- a/DQM/L1TMonitor/interface/L1THIonImp.h +++ b/DQM/L1TMonitor/interface/L1THIonImp.h @@ -28,11 +28,11 @@ class L1THIonImp : 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; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; //virtual std::vector SortMinBiasBit(std::vector, std::vector); virtual std::vector SortMinBiasBit(uint16_t, uint16_t); diff --git a/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h b/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h index c1de2b50e540d..8f149eb6b4674 100644 --- a/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h +++ b/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h @@ -26,8 +26,8 @@ class L1TMP7ZeroSupp : public DQMEDAnalyzer { protected: - 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&, const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TPUM.h b/DQM/L1TMonitor/interface/L1TPUM.h index 3280f823959d0..5ddbd2a055e17 100644 --- a/DQM/L1TMonitor/interface/L1TPUM.h +++ b/DQM/L1TMonitor/interface/L1TPUM.h @@ -28,10 +28,10 @@ class L1TPUM : public DQMEDAnalyzer { virtual ~L1TPUM(); 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&); - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: edm::EDGetTokenT regionSource_; diff --git a/DQM/L1TMonitor/interface/L1TRCT.h b/DQM/L1TMonitor/interface/L1TRCT.h index 6fe6763c17c5d..cb113d3547ae5 100644 --- a/DQM/L1TMonitor/interface/L1TRCT.h +++ b/DQM/L1TMonitor/interface/L1TRCT.h @@ -49,10 +49,10 @@ class L1TRCT : 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; - 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 ; private: diff --git a/DQM/L1TMonitor/interface/L1TRPCTF.h b/DQM/L1TMonitor/interface/L1TRPCTF.h index 14ed48b5e5707..7c0fe913d2347 100755 --- a/DQM/L1TMonitor/interface/L1TRPCTF.h +++ b/DQM/L1TMonitor/interface/L1TRPCTF.h @@ -52,14 +52,14 @@ class L1TRPCTF : 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; // BeginJob virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - virtual void beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c); - void endLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c); + virtual void beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c) override; + void endLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c) override; private: diff --git a/DQM/L1TMonitor/interface/L1TRPCTPG.h b/DQM/L1TMonitor/interface/L1TRPCTPG.h index c6a15d044e0c4..6cbf9d1ca1fb2 100755 --- a/DQM/L1TMonitor/interface/L1TRPCTPG.h +++ b/DQM/L1TMonitor/interface/L1TRPCTPG.h @@ -67,12 +67,12 @@ class L1TRPCTPG : 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; // BeginRun virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; + virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; private: // ----------member data --------------------------- diff --git a/DQM/L1TMonitor/interface/L1TRate.h b/DQM/L1TMonitor/interface/L1TRate.h index 3130cf5c0b113..53a5c99aad661 100644 --- a/DQM/L1TMonitor/interface/L1TRate.h +++ b/DQM/L1TMonitor/interface/L1TRate.h @@ -55,14 +55,14 @@ class L1TRate : 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 //void beginJob(); // BeginJob //void endJob (); // EndJob virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; //void endRun (const edm::Run& run, const edm::EventSetup& iSetup); - virtual void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); - virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); + 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&); // Private methods diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h index 2e9203eb70a3e..00f48516a62b9 100644 --- a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h +++ b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h @@ -64,11 +64,11 @@ class L1TStage2CaloLayer1 : public DQMEDAnalyzer { virtual ~L1TStage2CaloLayer1(); 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&); - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); - void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; + void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: void updateMismatch(const edm::Event& e, int mismatchType); diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h index fe38a9f4ce81c..1f148ea1461a6 100644 --- a/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h +++ b/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h @@ -27,10 +27,10 @@ class L1TStage2CaloLayer2 : public DQMEDAnalyzer { protected: - 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 bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override ; - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h index 08d9da0593677..d08d534b73955 100644 --- a/DQM/L1TMonitor/interface/L1TStage2EMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2EMTF.h @@ -23,8 +23,8 @@ class L1TStage2EMTF : public DQMEDAnalyzer { protected: - 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&, const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2MuonComp.h b/DQM/L1TMonitor/interface/L1TStage2MuonComp.h index 68353bfd3b64e..a221dd8b57e29 100644 --- a/DQM/L1TMonitor/interface/L1TStage2MuonComp.h +++ b/DQM/L1TMonitor/interface/L1TStage2MuonComp.h @@ -21,8 +21,8 @@ class L1TStage2MuonComp : public DQMEDAnalyzer { protected: - 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&, const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h b/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h index dfb99c7d67681..97b3fc6eba948 100644 --- a/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h +++ b/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h @@ -21,8 +21,8 @@ class L1TStage2RegionalMuonCandComp : public DQMEDAnalyzer { protected: - 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&, const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2uGMT.h b/DQM/L1TMonitor/interface/L1TStage2uGMT.h index 615c91f274cc1..4e9bb2db6e218 100644 --- a/DQM/L1TMonitor/interface/L1TStage2uGMT.h +++ b/DQM/L1TMonitor/interface/L1TStage2uGMT.h @@ -23,8 +23,8 @@ class L1TStage2uGMT : public DQMEDAnalyzer { protected: - 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&, const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2uGT.h b/DQM/L1TMonitor/interface/L1TStage2uGT.h index c0ba075abd851..835a26386a976 100644 --- a/DQM/L1TMonitor/interface/L1TStage2uGT.h +++ b/DQM/L1TMonitor/interface/L1TStage2uGT.h @@ -50,11 +50,11 @@ class L1TStage2uGT: public DQMEDAnalyzer { virtual ~L1TStage2uGT(); // destructor protected: - 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 endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); // end section + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; // end section private: diff --git a/DQM/L1TMonitor/interface/L1TSync.h b/DQM/L1TMonitor/interface/L1TSync.h index 43676464f4efe..ba286b8f682ce 100644 --- a/DQM/L1TMonitor/interface/L1TSync.h +++ b/DQM/L1TMonitor/interface/L1TSync.h @@ -90,12 +90,12 @@ class L1TSync : 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 beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); - virtual void endLuminosityBlock (edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c); + 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 bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; // Private Methods diff --git a/DQM/L1TMonitor/interface/L1TdeCSCTF.h b/DQM/L1TMonitor/interface/L1TdeCSCTF.h index 5a1b906268eb2..a82a86fb051ae 100644 --- a/DQM/L1TMonitor/interface/L1TdeCSCTF.h +++ b/DQM/L1TMonitor/interface/L1TdeCSCTF.h @@ -68,10 +68,10 @@ class L1TdeCSCTF : public thread_unsafe::DQMEDAnalyzer { protected: - void analyze(edm::Event const& e, edm::EventSetup const& iSetup); + void analyze(edm::Event const& e, edm::EventSetup const& iSetup) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; + virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; public: explicit L1TdeCSCTF(edm::ParameterSet const& pset); diff --git a/DQM/L1TMonitor/interface/L1TdeGCT.h b/DQM/L1TMonitor/interface/L1TdeGCT.h index 7f4f390a0d482..c4c928038df96 100644 --- a/DQM/L1TMonitor/interface/L1TdeGCT.h +++ b/DQM/L1TMonitor/interface/L1TdeGCT.h @@ -34,11 +34,11 @@ class L1TdeGCT : public DQMEDAnalyzer { protected: - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; virtual void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TdeRCT.h b/DQM/L1TMonitor/interface/L1TdeRCT.h index fd8c12237d484..8cfd122e890a9 100644 --- a/DQM/L1TMonitor/interface/L1TdeRCT.h +++ b/DQM/L1TMonitor/interface/L1TdeRCT.h @@ -59,12 +59,12 @@ class L1TdeRCT : 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; //For FED vector monitoring virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void readFEDVector(MonitorElement*,const edm::EventSetup&); private: diff --git a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h index fa1851cb72939..e6f8f5699d805 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h +++ b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h @@ -33,9 +33,9 @@ class L1TdeStage2CaloLayer1 : public DQMEDAnalyzer { protected: void analyze(const edm::Event& e, const edm::EventSetup& c); virtual void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); - void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; + void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: void updateMismatch(const edm::Event& e, int mismatchType); diff --git a/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h b/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h index e2a45067573da..4a89911bf56c8 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h +++ b/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h @@ -20,8 +20,8 @@ class L1TdeStage2EMTF : public DQMEDAnalyzer { protected: - 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&, const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitorClient/interface/L1EmulatorErrorFlagClient.h b/DQM/L1TMonitorClient/interface/L1EmulatorErrorFlagClient.h index b8d90491fc2a2..67c887e5fdd6f 100644 --- a/DQM/L1TMonitorClient/interface/L1EmulatorErrorFlagClient.h +++ b/DQM/L1TMonitorClient/interface/L1EmulatorErrorFlagClient.h @@ -28,7 +28,7 @@ class L1EmulatorErrorFlagClient: public DQMEDHarvester { virtual ~L1EmulatorErrorFlagClient(); protected: - virtual void dqmEndLuminosityBlock(DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + virtual void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&) override; //performed in the endLumi virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob diff --git a/DQM/L1TMonitorClient/interface/L1TCSCTFClient.h b/DQM/L1TMonitorClient/interface/L1TCSCTFClient.h index c81a237da6d84..6ece4778a13ed 100644 --- a/DQM/L1TMonitorClient/interface/L1TCSCTFClient.h +++ b/DQM/L1TMonitorClient/interface/L1TCSCTFClient.h @@ -22,7 +22,7 @@ class L1TCSCTFClient: public DQMEDHarvester { protected: - void dqmEndLuminosityBlock(DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + 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/DQM/L1TMonitorClient/interface/L1TDTTFClient.h b/DQM/L1TMonitorClient/interface/L1TDTTFClient.h index d262565489829..ed39792fcc8f4 100644 --- a/DQM/L1TMonitorClient/interface/L1TDTTFClient.h +++ b/DQM/L1TMonitorClient/interface/L1TDTTFClient.h @@ -30,7 +30,7 @@ class L1TDTTFClient: public DQMEDHarvester { protected: - void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + void dqmEndLuminosityBlock(DQMStore::IBooker &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 void book(DQMStore::IBooker &ibooker); diff --git a/DQM/L1TMonitorClient/interface/L1TEventInfoClient.h b/DQM/L1TMonitorClient/interface/L1TEventInfoClient.h index 968660e13b8f6..e3e8179db5942 100644 --- a/DQM/L1TMonitorClient/interface/L1TEventInfoClient.h +++ b/DQM/L1TMonitorClient/interface/L1TEventInfoClient.h @@ -51,7 +51,7 @@ class L1TEventInfoClient: public DQMEDHarvester { protected: void - dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock&, const edm::EventSetup&); + dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock&, const edm::EventSetup&) override; /// end job void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter)override; diff --git a/DQM/L1TMonitorClient/interface/L1TGCTClient.h b/DQM/L1TMonitorClient/interface/L1TGCTClient.h index f1df2825d0d33..58c38b4610e32 100644 --- a/DQM/L1TMonitorClient/interface/L1TGCTClient.h +++ b/DQM/L1TMonitorClient/interface/L1TGCTClient.h @@ -28,7 +28,7 @@ class L1TGCTClient: public DQMEDHarvester { protected: virtual void dqmEndJob(DQMStore::IBooker &ibooker,DQMStore::IGetter &igetter) override; - virtual void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker,DQMStore::IGetter &igetter,const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c); + virtual void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker,DQMStore::IGetter &igetter,const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c) override; private: diff --git a/DQM/L1TMonitorClient/interface/L1TGMTClient.h b/DQM/L1TMonitorClient/interface/L1TGMTClient.h index cfc95fb43fd73..836e7f30644f6 100644 --- a/DQM/L1TMonitorClient/interface/L1TGMTClient.h +++ b/DQM/L1TMonitorClient/interface/L1TGMTClient.h @@ -23,7 +23,7 @@ class L1TGMTClient: public DQMEDHarvester { protected: virtual void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter)override; - virtual void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& evSetup); + virtual void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& evSetup) override; private: diff --git a/DQM/L1TMonitorClient/interface/L1TOccupancyClient.h b/DQM/L1TMonitorClient/interface/L1TOccupancyClient.h index 6b64b464967f3..c1f0443ad48aa 100644 --- a/DQM/L1TMonitorClient/interface/L1TOccupancyClient.h +++ b/DQM/L1TMonitorClient/interface/L1TOccupancyClient.h @@ -41,7 +41,7 @@ class L1TOccupancyClient: public DQMEDHarvester { void dqmEndJob (DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter)override; void book (DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter); - void dqmEndLuminosityBlock (DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c); // DQM Client Diagnostic + void dqmEndLuminosityBlock (DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c) override; // DQM Client Diagnostic //DQM test routines double xySymmetry(const edm::ParameterSet& ps, diff --git a/DQM/L1TMonitorClient/interface/L1TRPCTFClient.h b/DQM/L1TMonitorClient/interface/L1TRPCTFClient.h index e8d8ff6e8098b..bbea7f0d2642e 100644 --- a/DQM/L1TMonitorClient/interface/L1TRPCTFClient.h +++ b/DQM/L1TMonitorClient/interface/L1TRPCTFClient.h @@ -31,7 +31,7 @@ class L1TRPCTFClient: public DQMEDHarvester { protected: - void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&); //performed in the endLumi + void dqmEndLuminosityBlock(DQMStore::IBooker &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 diff --git a/DQM/L1TMonitorClient/interface/L1TStage2CaloLayer2DEClient.h b/DQM/L1TMonitorClient/interface/L1TStage2CaloLayer2DEClient.h index 6c106cad73c4c..6eb65f3c3c15e 100644 --- a/DQM/L1TMonitorClient/interface/L1TStage2CaloLayer2DEClient.h +++ b/DQM/L1TMonitorClient/interface/L1TStage2CaloLayer2DEClient.h @@ -16,7 +16,7 @@ class L1TStage2CaloLayer2DEClient: public DQMEDHarvester { protected: virtual void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter)override; - virtual void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker,DQMStore::IGetter &igetter,const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c); + virtual void dqmEndLuminosityBlock(DQMStore::IBooker &ibooker,DQMStore::IGetter &igetter,const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c) override; private: diff --git a/DQM/L1TMonitorClient/interface/L1TTestsSummary.h b/DQM/L1TMonitorClient/interface/L1TTestsSummary.h index 1f24a499ae5ae..c12a98051d9c5 100644 --- a/DQM/L1TMonitorClient/interface/L1TTestsSummary.h +++ b/DQM/L1TMonitorClient/interface/L1TTestsSummary.h @@ -36,7 +36,7 @@ class L1TTestsSummary: public DQMEDHarvester { protected: - virtual void dqmEndLuminosityBlock (DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c); // DQM Client Diagnostic + virtual void dqmEndLuminosityBlock (DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg,const edm::EventSetup& c) override; // DQM Client Diagnostic virtual void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter)override; virtual void book(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter); diff --git a/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc b/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc index 35d9338815a8d..8973ebf3a769c 100644 --- a/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc +++ b/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc @@ -102,7 +102,7 @@ void L1EmulatorErrorFlagClient::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore: } } -void L1EmulatorErrorFlagClient::dqmEndLuminosityBlock(DQMStore::IGetter &igetter, +void L1EmulatorErrorFlagClient::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& evSetup) { // reset the summary content values diff --git a/DQM/L1TMonitorClient/src/L1TCSCTFClient.cc b/DQM/L1TMonitorClient/src/L1TCSCTFClient.cc index b131ae7dc9d9b..9bf72cd1e246d 100644 --- a/DQM/L1TMonitorClient/src/L1TCSCTFClient.cc +++ b/DQM/L1TMonitorClient/src/L1TCSCTFClient.cc @@ -36,7 +36,7 @@ void L1TCSCTFClient::initialize(){ } -void L1TCSCTFClient::dqmEndLuminosityBlock(DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c){ +void L1TCSCTFClient::dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &igetter, const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c){ } //-------------------------------------------------------- diff --git a/DQM/Physics/src/B2GDQM.h b/DQM/Physics/src/B2GDQM.h index 9dbaac4c11a85..b7ee872a1c49b 100644 --- a/DQM/Physics/src/B2GDQM.h +++ b/DQM/Physics/src/B2GDQM.h @@ -84,7 +84,7 @@ class B2GDQM : public DQMEDAnalyzer { virtual ~B2GDQM(); protected: - virtual void analyze(edm::Event const& e, edm::EventSetup const& eSetup); + virtual void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; virtual void analyzeJets(edm::Event const& e, edm::EventSetup const& eSetup); virtual void analyzeSemiMu(edm::Event const& e, diff --git a/DQM/Physics/src/BPhysicsOniaDQM.h b/DQM/Physics/src/BPhysicsOniaDQM.h index 21bad30ea4927..b70e7c809bacc 100644 --- a/DQM/Physics/src/BPhysicsOniaDQM.h +++ b/DQM/Physics/src/BPhysicsOniaDQM.h @@ -35,7 +35,7 @@ class BPhysicsOniaDQM : public DQMEDAnalyzer { 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; private: float computeMass(const math::XYZVector& vec1, const math::XYZVector& vec2); diff --git a/DQM/Physics/src/EwkDQM.h b/DQM/Physics/src/EwkDQM.h index 160f2a92a62b2..ffe97bf622ec8 100644 --- a/DQM/Physics/src/EwkDQM.h +++ b/DQM/Physics/src/EwkDQM.h @@ -39,10 +39,10 @@ class EwkDQM : public DQMEDAnalyzer { //Book histograms 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; /// Get the analysis - void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; double calcDeltaPhi(double phi1, double phi2); diff --git a/DQM/Physics/src/EwkElecDQM.h b/DQM/Physics/src/EwkElecDQM.h index f2d772f793a60..d72d16787d022 100644 --- a/DQM/Physics/src/EwkElecDQM.h +++ b/DQM/Physics/src/EwkElecDQM.h @@ -32,9 +32,9 @@ class EwkElecDQM : public DQMEDAnalyzer { //Book histograms 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&, const edm::EventSetup&); - virtual void endRun(const edm::Run&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(const edm::Run&, const edm::EventSetup&) override; double calcDeltaPhi(double phi1, double phi2); diff --git a/DQM/Physics/src/EwkMuDQM.h b/DQM/Physics/src/EwkMuDQM.h index 55fe1b6af9b75..2ad3089f64c02 100644 --- a/DQM/Physics/src/EwkMuDQM.h +++ b/DQM/Physics/src/EwkMuDQM.h @@ -30,12 +30,12 @@ class MonitorElement; class EwkMuDQM : public DQMEDAnalyzer { public: EwkMuDQM(const edm::ParameterSet&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; //Book histograms void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void endRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + virtual void endRun(const edm::Run&, const edm::EventSetup&) override; void init_histograms(); diff --git a/DQM/Physics/src/EwkMuLumiMonitorDQM.h b/DQM/Physics/src/EwkMuLumiMonitorDQM.h index bfb873d3d91a1..ec9dcf193690a 100644 --- a/DQM/Physics/src/EwkMuLumiMonitorDQM.h +++ b/DQM/Physics/src/EwkMuLumiMonitorDQM.h @@ -37,12 +37,12 @@ class MonitorElement; class EwkMuLumiMonitorDQM : public DQMEDAnalyzer { public: EwkMuLumiMonitorDQM(const edm::ParameterSet&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; //Book histograms void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&); - virtual void endRun(const edm::Run&, const edm::EventSetup&); + virtual void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; + virtual void endRun(const edm::Run&, const edm::EventSetup&) override; void init_histograms(); double muIso(const reco::Muon&); diff --git a/DQM/Physics/src/EwkTauDQM.h b/DQM/Physics/src/EwkTauDQM.h index c52fce4ad85c7..c1abb19af72fe 100644 --- a/DQM/Physics/src/EwkTauDQM.h +++ b/DQM/Physics/src/EwkTauDQM.h @@ -31,8 +31,8 @@ class EwkTauDQM : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; - void analyze(const edm::Event&, const edm::EventSetup&); - void endRun(const edm::Run&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; + void endRun(const edm::Run&, const edm::EventSetup&) override; private: std::string dqmDirectory_; diff --git a/DQM/Physics/src/ExoticaDQM.h b/DQM/Physics/src/ExoticaDQM.h index baa101650b074..7d4157356bb5d 100644 --- a/DQM/Physics/src/ExoticaDQM.h +++ b/DQM/Physics/src/ExoticaDQM.h @@ -109,7 +109,7 @@ class ExoticaDQM: public DQMEDAnalyzer { protected: - virtual void analyze(edm::Event const& e, edm::EventSetup const& eSetup); + virtual void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; //Resonances virtual void analyzeDiJets(edm::Event const& e); diff --git a/DQM/Physics/src/HiggsDQM.h b/DQM/Physics/src/HiggsDQM.h index f54b06fd70d62..34193f0744c20 100644 --- a/DQM/Physics/src/HiggsDQM.h +++ b/DQM/Physics/src/HiggsDQM.h @@ -51,12 +51,12 @@ class HiggsDQM : public DQMEDAnalyzer { //Book histograms 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; void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context); + edm::EventSetup const& context) override; void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& c); - void endRun(edm::Run const& run, edm::EventSetup const& eSetup); + edm::EventSetup const& c) override; + void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: double Distance(const reco::Candidate& c1, const reco::Candidate& c2); diff --git a/DQM/Physics/src/QcdHighPtDQM.h b/DQM/Physics/src/QcdHighPtDQM.h index 571b7426fa45d..1c081760b2fe8 100644 --- a/DQM/Physics/src/QcdHighPtDQM.h +++ b/DQM/Physics/src/QcdHighPtDQM.h @@ -26,7 +26,7 @@ class QcdHighPtDQM : public DQMEDAnalyzer { virtual ~QcdHighPtDQM(); 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: // input tags/Tokens for Jets/MET diff --git a/DQM/Physics/src/QcdLowPtDQM.h b/DQM/Physics/src/QcdLowPtDQM.h index 0f40fd371a873..1963f7ee6cb9d 100644 --- a/DQM/Physics/src/QcdLowPtDQM.h +++ b/DQM/Physics/src/QcdLowPtDQM.h @@ -119,13 +119,13 @@ class QcdLowPtDQM : public DQMEDAnalyzer { QcdLowPtDQM(const edm::ParameterSet ¶meters); virtual ~QcdLowPtDQM(); - 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 &iEvent, const edm::EventSetup &iSetup); + void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override; void endLuminosityBlock(const edm::LuminosityBlock &l, - const edm::EventSetup &iSetup); - void endRun(const edm::Run &r, const edm::EventSetup &iSetup); + const edm::EventSetup &iSetup) override; + void endRun(const edm::Run &r, const edm::EventSetup &iSetup) override; private: void book1D(DQMStore::IBooker &, std::vector &mes, const std::string &name, diff --git a/DQM/Physics/src/QcdPhotonsDQM.h b/DQM/Physics/src/QcdPhotonsDQM.h index f1618689abc18..8dd5a824f1a57 100644 --- a/DQM/Physics/src/QcdPhotonsDQM.h +++ b/DQM/Physics/src/QcdPhotonsDQM.h @@ -38,7 +38,7 @@ class QcdPhotonsDQM : public DQMEDAnalyzer { 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; private: // ----------member data --------------------------- diff --git a/DQM/Physics/src/QcdUeDQM.h b/DQM/Physics/src/QcdUeDQM.h index 21749580030d1..441f0e29a0dbd 100644 --- a/DQM/Physics/src/QcdUeDQM.h +++ b/DQM/Physics/src/QcdUeDQM.h @@ -55,10 +55,10 @@ class QcdUeDQM : public DQMEDAnalyzer { public: QcdUeDQM(const edm::ParameterSet ¶meters); virtual ~QcdUeDQM(); - 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 &iEvent, const edm::EventSetup &iSetup); + void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override; private: bool isHltConfigSuccessful_; // to prevent processing in case of problems diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM.h b/DQM/Physics/src/SingleTopTChannelLeptonDQM.h index 151525ab4474a..9ed971f38aa83 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM.h +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM.h @@ -303,7 +303,7 @@ class SingleTopTChannelLeptonDQM : public DQMEDAnalyzer { ~SingleTopTChannelLeptonDQM() {}; /// do this during the event loop - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: //Book histograms diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h index 803b5c08e33f7..e8dfd541eca0d 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h @@ -233,7 +233,7 @@ class SingleTopTChannelLeptonDQM_miniAOD : public DQMEDAnalyzer { ~SingleTopTChannelLeptonDQM_miniAOD() {}; /// do this during the event loop - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: //Book histograms diff --git a/DQM/Physics/src/SusyDQM.h b/DQM/Physics/src/SusyDQM.h index c2b83aeca4837..5fdd362bfa274 100644 --- a/DQM/Physics/src/SusyDQM.h +++ b/DQM/Physics/src/SusyDQM.h @@ -59,7 +59,7 @@ class SusyDQM : public DQMEDAnalyzer { edm::EventSetup const&) override; private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual bool goodSusyElectron(const Ele*); virtual bool goodSusyMuon(const Mu*); diff --git a/DQM/Physics/src/TopDiLeptonDQM.h b/DQM/Physics/src/TopDiLeptonDQM.h index 64c0cacb53257..6ed69ed0c7fd8 100644 --- a/DQM/Physics/src/TopDiLeptonDQM.h +++ b/DQM/Physics/src/TopDiLeptonDQM.h @@ -45,7 +45,7 @@ class TopDiLeptonDQM : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; private: - virtual void analyze(const edm::Event&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; std::string moduleName_; std::string outputFile_; diff --git a/DQM/Physics/src/TopDiLeptonOfflineDQM.h b/DQM/Physics/src/TopDiLeptonOfflineDQM.h index 19b092ab8adc8..b80bdfcda1b15 100644 --- a/DQM/Physics/src/TopDiLeptonOfflineDQM.h +++ b/DQM/Physics/src/TopDiLeptonOfflineDQM.h @@ -328,7 +328,7 @@ class TopDiLeptonOfflineDQM : public DQMEDAnalyzer { ~TopDiLeptonOfflineDQM() {} /// do this during the event loop - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: //Book histograms diff --git a/DQM/Physics/src/TopSingleLeptonDQM.h b/DQM/Physics/src/TopSingleLeptonDQM.h index 6bc75c1a67d3f..6f009126012ab 100644 --- a/DQM/Physics/src/TopSingleLeptonDQM.h +++ b/DQM/Physics/src/TopSingleLeptonDQM.h @@ -284,7 +284,7 @@ class TopSingleLeptonDQM : public DQMEDAnalyzer { ~TopSingleLeptonDQM() {}; /// do this during the event loop - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: //Book histograms diff --git a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h index 330903a75045a..794d48fc95171 100644 --- a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h +++ b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h @@ -212,7 +212,7 @@ class TopSingleLeptonDQM_miniAOD : public DQMEDAnalyzer { ~TopSingleLeptonDQM_miniAOD() {}; /// do this during the event loop - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: //Book histograms diff --git a/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h b/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h index 58785672dde43..583144c7a1329 100644 --- a/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h +++ b/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h @@ -37,7 +37,7 @@ class PhysicsObjectsMonitor : public DQMEDAnalyzer { // Operations 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: std::string theSTAMuonLabel; diff --git a/DQM/PixelLumi/plugins/PixelLumiDQM.h b/DQM/PixelLumi/plugins/PixelLumiDQM.h index cf48758a825d8..729c706568845 100755 --- a/DQM/PixelLumi/plugins/PixelLumiDQM.h +++ b/DQM/PixelLumi/plugins/PixelLumiDQM.h @@ -55,14 +55,14 @@ class PixelLumiDQM : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); 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; - virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&); - virtual void endRun(edm::Run const&, edm::EventSetup const&); + virtual void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; + 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; // This is a kludge method to infer the filled bunches from the cluster count; // notice that this cannot be used with random triggers. diff --git a/DQM/RPCMonitorClient/interface/RPCChamberQuality.h b/DQM/RPCMonitorClient/interface/RPCChamberQuality.h index f4e8a80be757b..ac56b1ebc8dd2 100644 --- a/DQM/RPCMonitorClient/interface/RPCChamberQuality.h +++ b/DQM/RPCMonitorClient/interface/RPCChamberQuality.h @@ -16,8 +16,8 @@ class RPCChamberQuality: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/DQM/RPCMonitorClient/interface/RPCDCSSummary.h b/DQM/RPCMonitorClient/interface/RPCDCSSummary.h index d6843c8d03a48..5a697818f9e2c 100644 --- a/DQM/RPCMonitorClient/interface/RPCDCSSummary.h +++ b/DQM/RPCMonitorClient/interface/RPCDCSSummary.h @@ -18,8 +18,8 @@ class RPCDCSSummary : public DQMEDHarvester { // Operations 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 diff --git a/DQM/RPCMonitorClient/interface/RPCDaqInfo.h b/DQM/RPCMonitorClient/interface/RPCDaqInfo.h index fb2d5371336c0..270270726a455 100644 --- a/DQM/RPCMonitorClient/interface/RPCDaqInfo.h +++ b/DQM/RPCMonitorClient/interface/RPCDaqInfo.h @@ -18,8 +18,8 @@ class RPCDaqInfo : public DQMEDHarvester{ ~RPCDaqInfo(); 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/DQM/RPCMonitorClient/interface/RPCDataCertification.h b/DQM/RPCMonitorClient/interface/RPCDataCertification.h index 841bb4cf8be41..4fe1023811acf 100644 --- a/DQM/RPCMonitorClient/interface/RPCDataCertification.h +++ b/DQM/RPCMonitorClient/interface/RPCDataCertification.h @@ -17,8 +17,8 @@ class RPCDataCertification : public DQMEDHarvester{ virtual ~RPCDataCertification(); 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 diff --git a/DQM/RPCMonitorClient/interface/RPCDcsInfoClient.h b/DQM/RPCMonitorClient/interface/RPCDcsInfoClient.h index 1c58d618969e2..67f450ab63ac0 100644 --- a/DQM/RPCMonitorClient/interface/RPCDcsInfoClient.h +++ b/DQM/RPCMonitorClient/interface/RPCDcsInfoClient.h @@ -14,8 +14,8 @@ class RPCDcsInfoClient : 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 diff --git a/DQM/RPCMonitorClient/interface/RPCDqmClient.h b/DQM/RPCMonitorClient/interface/RPCDqmClient.h index 7b529759d9ba8..efd6e7e9e0ee5 100644 --- a/DQM/RPCMonitorClient/interface/RPCDqmClient.h +++ b/DQM/RPCMonitorClient/interface/RPCDqmClient.h @@ -22,8 +22,8 @@ class RPCDqmClient: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 void makeClientMap(const edm::ParameterSet& parameters_); diff --git a/DQM/RPCMonitorClient/interface/RPCEfficiencyPerRingLayer.h b/DQM/RPCMonitorClient/interface/RPCEfficiencyPerRingLayer.h index 3e9f2a20f547d..08faca5ed63e7 100644 --- a/DQM/RPCMonitorClient/interface/RPCEfficiencyPerRingLayer.h +++ b/DQM/RPCMonitorClient/interface/RPCEfficiencyPerRingLayer.h @@ -18,8 +18,8 @@ class RPCEfficiencyPerRingLayer: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 diff --git a/DQM/RPCMonitorClient/interface/RPCEfficiencySecond.h b/DQM/RPCMonitorClient/interface/RPCEfficiencySecond.h index abe58cf416f18..27a300457ada2 100644 --- a/DQM/RPCMonitorClient/interface/RPCEfficiencySecond.h +++ b/DQM/RPCMonitorClient/interface/RPCEfficiencySecond.h @@ -23,8 +23,8 @@ class RPCEfficiencySecond :public DQMEDHarvester{ int rollY(std::string shortname,const std::vector& rollNames); 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/DQM/RPCMonitorClient/interface/RPCEfficiencyShiftHisto.h b/DQM/RPCMonitorClient/interface/RPCEfficiencyShiftHisto.h index c92abece3c157..6fd603da557ec 100644 --- a/DQM/RPCMonitorClient/interface/RPCEfficiencyShiftHisto.h +++ b/DQM/RPCMonitorClient/interface/RPCEfficiencyShiftHisto.h @@ -26,8 +26,8 @@ class RPCEfficiencyShiftHisto:public DQMEDHarvester{ virtual ~RPCEfficiencyShiftHisto(); 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 diff --git a/DQM/RPCMonitorClient/interface/RPCEventSummary.h b/DQM/RPCMonitorClient/interface/RPCEventSummary.h index e7344b45af2f5..26ae3b9e4050c 100644 --- a/DQM/RPCMonitorClient/interface/RPCEventSummary.h +++ b/DQM/RPCMonitorClient/interface/RPCEventSummary.h @@ -22,8 +22,8 @@ class RPCEventSummary: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 diff --git a/DQM/RPCMonitorClient/interface/RPCFEDIntegrity.h b/DQM/RPCMonitorClient/interface/RPCFEDIntegrity.h index ee084acacf0e3..5b068443a148b 100644 --- a/DQM/RPCMonitorClient/interface/RPCFEDIntegrity.h +++ b/DQM/RPCMonitorClient/interface/RPCFEDIntegrity.h @@ -34,7 +34,7 @@ class RPCFEDIntegrity:public DQMEDAnalyzer{ void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; /// Analyze - void analyze(const edm::Event& iEvent, const edm::EventSetup& c); + void analyze(const edm::Event& iEvent, const edm::EventSetup& c) override; private: diff --git a/DQM/RPCMonitorClient/interface/RPCMonitorLinkSynchro.h b/DQM/RPCMonitorClient/interface/RPCMonitorLinkSynchro.h index c1f93e54530d7..47e4805e06860 100644 --- a/DQM/RPCMonitorClient/interface/RPCMonitorLinkSynchro.h +++ b/DQM/RPCMonitorClient/interface/RPCMonitorLinkSynchro.h @@ -26,9 +26,9 @@ class RPCMonitorLinkSynchro : public DQMEDAnalyzer{ virtual ~RPCMonitorLinkSynchro(); void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) ; - virtual void endLuminosityBlock(const edm::LuminosityBlock&,const edm::EventSetup&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override ; + virtual void endLuminosityBlock(const edm::LuminosityBlock&,const edm::EventSetup&) override; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; virtual const RPCRawSynchro::ProdItem & select(const RPCRawSynchro::ProdItem &v, const edm::Event&, const edm::EventSetup&) { return v; }; protected: diff --git a/DQM/RPCMonitorClient/interface/RPCMonitorRaw.h b/DQM/RPCMonitorClient/interface/RPCMonitorRaw.h index a83c04ca416a0..9c7ceda840784 100644 --- a/DQM/RPCMonitorClient/interface/RPCMonitorRaw.h +++ b/DQM/RPCMonitorClient/interface/RPCMonitorRaw.h @@ -25,7 +25,7 @@ class RPCMonitorRaw :public DQMEDAnalyzer{ explicit RPCMonitorRaw( const edm::ParameterSet& cfg); virtual ~RPCMonitorRaw(); - 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/RPCMonitorClient/interface/RPCRecHitProbabilityClient.h b/DQM/RPCMonitorClient/interface/RPCRecHitProbabilityClient.h index c29b87e214a46..a3d576da0e881 100644 --- a/DQM/RPCMonitorClient/interface/RPCRecHitProbabilityClient.h +++ b/DQM/RPCMonitorClient/interface/RPCRecHitProbabilityClient.h @@ -19,8 +19,8 @@ class RPCRecHitProbabilityClient: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 diff --git a/DQM/RPCMonitorDigi/interface/RPCDcsInfo.h b/DQM/RPCMonitorDigi/interface/RPCDcsInfo.h index 4c8ab4f24a531..75fc358fb7805 100644 --- a/DQM/RPCMonitorDigi/interface/RPCDcsInfo.h +++ b/DQM/RPCMonitorDigi/interface/RPCDcsInfo.h @@ -28,9 +28,9 @@ class RPCDcsInfo: 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; diff --git a/DQM/RPCMonitorDigi/interface/RPCEfficiency.h b/DQM/RPCMonitorDigi/interface/RPCEfficiency.h index 790453a5a3742..dbe82709c7511 100644 --- a/DQM/RPCMonitorDigi/interface/RPCEfficiency.h +++ b/DQM/RPCMonitorDigi/interface/RPCEfficiency.h @@ -100,7 +100,7 @@ class RPCEfficiency : public DQMEDAnalyzer { protected: - 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 bookDetUnitSeg(DQMStore::IBooker &, RPCDetId & detId,int nstrips, std::string folder, std::map & ); std::map > rollstoreDT; diff --git a/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h b/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h index f84c12753b4d6..038850609741d 100644 --- a/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h +++ b/DQM/RPCMonitorDigi/interface/RPCMonitorDigi.h @@ -30,7 +30,7 @@ class RPCMonitorDigi : public DQMEDAnalyzer { protected: - 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; /// Booking of MonitoringElement for one RPCDetId (= roll) void bookRollME(DQMStore::IBooker &,RPCDetId& , const edm::EventSetup&, const std::string &, std::map &); diff --git a/DQM/RPCMonitorDigi/interface/RPCRecHitProbability.h b/DQM/RPCMonitorDigi/interface/RPCRecHitProbability.h index f3a8a8b5fba63..a23e311327698 100644 --- a/DQM/RPCMonitorDigi/interface/RPCRecHitProbability.h +++ b/DQM/RPCMonitorDigi/interface/RPCRecHitProbability.h @@ -25,7 +25,7 @@ class RPCRecHitProbability : public DQMEDAnalyzer { protected: - 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/RPCMonitorDigi/interface/RPCTTUMonitor.h b/DQM/RPCMonitorDigi/interface/RPCTTUMonitor.h index fa769d0c84e4b..41465a3b6a528 100644 --- a/DQM/RPCMonitorDigi/interface/RPCTTUMonitor.h +++ b/DQM/RPCMonitorDigi/interface/RPCTTUMonitor.h @@ -56,7 +56,7 @@ class RPCTTUMonitor : public DQMEDAnalyzer { protected: - 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/SiPixelMonitorClient/interface/SiPixelEDAClient.h b/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h index 7329086929180..0fc8cce0d2945 100644 --- a/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h +++ b/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h @@ -36,7 +36,7 @@ class SiPixelEDAClient: public DQMEDHarvester{ protected: void beginRun(edm::Run const& run, - edm::EventSetup const& eSetup); + edm::EventSetup const& eSetup) override; void dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& c) override; void dqmEndJob(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter) override; diff --git a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h index 3b20a4a2106bd..79feb45c57fb9 100644 --- a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h +++ b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiSource.h @@ -52,8 +52,8 @@ typedef edm::DetSet::const_iterator DigiIterator; - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) ; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; diff --git a/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h b/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h index 33188da6c2a5e..79bdd84fc5d05 100644 --- a/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h +++ b/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h @@ -51,9 +51,9 @@ explicit SiPixelHLTSource(const edm::ParameterSet& conf); ~SiPixelHLTSource(); - 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; - virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) ; + virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override; virtual void bookMEs(DQMStore::IBooker &); diff --git a/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h b/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h index 35f3b4b8d7d22..3d880999b741f 100755 --- a/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h +++ b/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h @@ -57,8 +57,8 @@ typedef edm::DetSet::const_iterator ErrorIterator; - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) ; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override; virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; virtual void buildStructure(edm::EventSetup const&); diff --git a/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h b/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h index 13fa94c612d14..a51aabba186b9 100644 --- a/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h +++ b/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h @@ -58,9 +58,9 @@ class SiPixelRecHitSource : public DQMEDAnalyzer { // typedef edm::DetSet::const_iterator RecHitIterator; - 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 &, const edm::EventSetup&) override; - virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) ; + virtual void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override; virtual void buildStructure(edm::EventSetup const&); virtual void bookMEs(DQMStore::IBooker &, const edm::EventSetup& iSetup); diff --git a/DQM/SiStripCommissioningSources/plugins/tracking/ClusterCount.h b/DQM/SiStripCommissioningSources/plugins/tracking/ClusterCount.h index 4c08f2ca3c4e8..2b760861b0fab 100644 --- a/DQM/SiStripCommissioningSources/plugins/tracking/ClusterCount.h +++ b/DQM/SiStripCommissioningSources/plugins/tracking/ClusterCount.h @@ -52,7 +52,7 @@ class ClusterCount : 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; // ----------member data --------------------------- // edm::InputTag clusterLabel_; diff --git a/DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h b/DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h index cc8478c82fce1..d2b15bd00e47f 100644 --- a/DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h +++ b/DQM/SiStripMonitorDigi/interface/SiStripBaselineValidator.h @@ -35,7 +35,7 @@ class SiStripBaselineValidator : public DQMEDAnalyzer explicit SiStripBaselineValidator(const edm::ParameterSet&); virtual ~SiStripBaselineValidator(); - 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/SiStripMonitorDigi/interface/SiStripMonitorDigi.h b/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h index f9060b5f845db..38698d48395d7 100644 --- a/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h +++ b/DQM/SiStripMonitorDigi/interface/SiStripMonitorDigi.h @@ -35,12 +35,12 @@ class SiStripMonitorDigi : public DQMEDAnalyzer { public: explicit SiStripMonitorDigi(const edm::ParameterSet&); ~SiStripMonitorDigi(); - virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void endRun(const edm::Run&, const edm::EventSetup&); - virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); - virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); + virtual void analyze(const edm::Event&, const edm::EventSetup&) override; + virtual void endRun(const edm::Run&, const edm::EventSetup&) override; + virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; + virtual void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c); + void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override; std::string topFolderName_; diff --git a/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc index f2e537045ffa9..5063418d2f1a1 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc @@ -75,7 +75,7 @@ class SiStripCMMonitorPlugin : public DQMEDAnalyzer 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; //update the cabling if necessary void updateCabling(const edm::EventSetup& eventSetup); diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc index 8bee6523d6f51..6ed6a681f47dd 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc @@ -60,7 +60,7 @@ class SiStripFEDCheckPlugin : public DQMEDAnalyzer private: virtual void analyze(const edm::Event&, const edm::EventSetup&) override; - virtual void endRun(); + virtual void endRun(edm::Run const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; @@ -340,7 +340,7 @@ void SiStripFEDCheckPlugin::bookHistograms(DQMStore::IBooker & ibooker , const e // ------------ method called once each run just after ending the event loop ------------ void -SiStripFEDCheckPlugin::endRun() +SiStripFEDCheckPlugin::endRun(edm::Run const&, edm::EventSetup const&) { updateHistograms(); } diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDDump.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDDump.cc index f222b70e2aa54..abbc6de40968d 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDDump.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDDump.cc @@ -26,7 +26,7 @@ class SiStripFEDDumpPlugin : public DQMEDAnalyzer explicit SiStripFEDDumpPlugin(const edm::ParameterSet&); ~SiStripFEDDumpPlugin(); 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; //tag of FEDRawData collection diff --git a/DQM/SiStripMonitorHardware/src/SiStripSpyMonitorModule.cc b/DQM/SiStripMonitorHardware/src/SiStripSpyMonitorModule.cc index 908b8671df7e6..7cec88390fcba 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripSpyMonitorModule.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripSpyMonitorModule.cc @@ -60,7 +60,7 @@ class SiStripSpyMonitorModule : public DQMEDAnalyzer 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; //check if contains pedsubtr data = 0 diff --git a/DQM/TrackingMonitorClient/interface/DQMScaleToClient.h b/DQM/TrackingMonitorClient/interface/DQMScaleToClient.h index 3c151e5f527ad..58ce06b888000 100644 --- a/DQM/TrackingMonitorClient/interface/DQMScaleToClient.h +++ b/DQM/TrackingMonitorClient/interface/DQMScaleToClient.h @@ -38,8 +38,8 @@ class DQMScaleToClient: 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: