From 2b4f4af2aff458a4eccf7cd069b4f4e6c9dbb4d3 Mon Sep 17 00:00:00 2001 From: Marcel Andre Schneider Date: Wed, 4 Dec 2019 11:41:26 +0100 Subject: [PATCH] Remove dqmEndRun from DQMEDAnalyzer. ... and also dqmBegin/EndLumi. This includes lots of automated changes to remove "empty" dqmBeginRun and dqmEndRun. dqmBeginRun remains allowed in DQMEDAnalyzer; it is called before booking and ME cannot (and must not) be accessed there. Any local member intialization should be fine to do there; it will be called for each of the edm::stream instancs once we switch back to stream. Technically all the code could simply be moved into bookHistograms, but having a separate beginRun makes more sense logically. Many dqmEndRun that only contain log messages and printouts where removed, even if they were more than basic debugging output. The remaining modules with non-trivial dqmEndRuns are converted to DQMOneEDAnalyzer. Commands like sed -i '/dqmBeginRun/,+3d' $(ag \ 'dqm(Begin|End)Run[^\n]*\n[^\n]*LogInfo[^\n]*\n\s*}' -l) were used to delete "useless" bodies. --- DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc | 5 ----- DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc | 10 ---------- DQM/CTPPS/plugins/TotemTimingDQMSource.cc | 7 ------- DQM/CastorMonitor/interface/CastorMonitorModule.h | 11 ++--------- DQM/HLTEvF/plugins/HLTObjectMonitor.cc | 6 ------ DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc | 6 ------ DQM/L1TMonitor/interface/BxTiming.h | 1 - DQM/L1TMonitor/interface/L1ExtraDQM.h | 4 ++-- DQM/L1TMonitor/interface/L1GtHwValidation.h | 1 - DQM/L1TMonitor/interface/L1TCSCTF.h | 2 -- DQM/L1TMonitor/interface/L1TCSCTPG.h | 1 - DQM/L1TMonitor/interface/L1TDEMON.h | 2 -- DQM/L1TMonitor/interface/L1TGCT.h | 1 - DQM/L1TMonitor/interface/L1TGMT.h | 3 --- DQM/L1TMonitor/interface/L1THIonImp.h | 1 - DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h | 1 - DQM/L1TMonitor/interface/L1TPUM.h | 1 - DQM/L1TMonitor/interface/L1TStage2BMTF.h | 1 - DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h | 1 - DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h | 1 - DQM/L1TMonitor/interface/L1TStage2EMTF.h | 1 - DQM/L1TMonitor/interface/L1TStage2MuonComp.h | 1 - DQM/L1TMonitor/interface/L1TStage2OMTF.h | 1 - .../interface/L1TStage2RegionalMuonCandComp.h | 1 - DQM/L1TMonitor/interface/L1TStage2uGMT.h | 1 - DQM/L1TMonitor/interface/L1TStage2uGMTMuon.h | 1 - DQM/L1TMonitor/interface/L1TdeCSCTF.h | 1 - DQM/L1TMonitor/interface/L1TdeGCT.h | 1 - DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h | 1 - DQM/L1TMonitor/interface/L1TdeStage2EMTF.h | 1 - DQM/L1TMonitor/interface/L1TdeStage2uGT.h | 1 - DQM/L1TMonitor/src/BxTiming.cc | 2 -- DQM/L1TMonitor/src/L1GtHwValidation.cc | 2 -- DQM/L1TMonitor/src/L1TCSCTF.cc | 2 -- DQM/L1TMonitor/src/L1TCSCTPG.cc | 2 -- DQM/L1TMonitor/src/L1TDEMON.cc | 2 -- DQM/L1TMonitor/src/L1TGCT.cc | 2 -- DQM/L1TMonitor/src/L1TGMT.cc | 2 -- DQM/L1TMonitor/src/L1THIonImp.cc | 2 -- DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc | 2 -- DQM/L1TMonitor/src/L1TPUM.cc | 2 -- DQM/L1TMonitor/src/L1TStage2BMTF.cc | 2 -- DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc | 2 -- DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc | 2 -- DQM/L1TMonitor/src/L1TStage2EMTF.cc | 2 -- DQM/L1TMonitor/src/L1TStage2MuonComp.cc | 2 -- DQM/L1TMonitor/src/L1TStage2OMTF.cc | 2 -- .../src/L1TStage2RegionalMuonCandComp.cc | 2 -- DQM/L1TMonitor/src/L1TStage2uGMT.cc | 2 -- DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc | 2 -- DQM/L1TMonitor/src/L1TdeCSCTF.cc | 2 -- DQM/L1TMonitor/src/L1TdeGCT.cc | 2 -- DQM/L1TMonitor/src/L1TdeStage2CaloLayer1.cc | 2 -- DQM/L1TMonitor/src/L1TdeStage2EMTF.cc | 2 -- DQM/L1TMonitor/src/L1TdeStage2uGT.cc | 2 -- DQM/Physics/src/EwkElecDQM.h | 4 ++-- DQM/Physics/src/EwkMuDQM.cc | 2 -- DQM/Physics/src/EwkMuDQM.h | 1 - DQM/Physics/src/EwkMuLumiMonitorDQM.cc | 14 -------------- DQM/Physics/src/EwkMuLumiMonitorDQM.h | 1 - DQM/Physics/src/EwkTauDQM.h | 4 ++-- DQM/Physics/src/HiggsDQM.cc | 12 ------------ DQM/Physics/src/HiggsDQM.h | 1 - DQM/PixelLumi/plugins/PixelLumiDQM.cc | 6 ------ DQM/PixelLumi/plugins/PixelLumiDQM.h | 2 -- DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc | 4 ---- .../src/SiStripFEDDataCheck.cc | 4 ++-- .../interface/SiStripMonitorPedestals.h | 4 ++-- .../interface/SiStripMonitorQuality.h | 4 ++-- .../interface/SiStripMonitorRawData.h | 4 ++-- DQM/TrackingMonitor/interface/LogMessageMonitor.h | 3 --- DQM/TrackingMonitor/src/LogMessageMonitor.cc | 11 ----------- DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h | 4 ++-- .../JetMET/interface/DQMPFCandidateAnalyzer.h | 3 --- DQMOffline/JetMET/interface/JetAnalyzer.h | 3 --- DQMOffline/JetMET/interface/METAnalyzer.h | 4 ++-- DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc | 3 --- DQMOffline/JetMET/src/JetAnalyzer.cc | 3 --- DQMOffline/L1Trigger/interface/L1TEGammaOffline.h | 4 ++-- DQMOffline/L1Trigger/interface/L1TRate_Offline.h | 1 - .../interface/L1TStage2CaloLayer2Offline.h | 1 - DQMOffline/L1Trigger/interface/L1TTauOffline.h | 2 -- DQMOffline/L1Trigger/src/L1TRate_Offline.cc | 3 --- .../L1Trigger/src/L1TStage2CaloLayer2Offline.cc | 4 ---- DQMOffline/L1Trigger/src/L1TTauOffline.cc | 4 ---- .../Trigger/plugins/HLTMuonOfflineAnalyzer.cc | 5 ----- .../Trigger/plugins/HLTTagAndProbeOfflineSource.cc | 1 - .../plugins/HigPhotonJetHLTOfflineSource.cc | 5 ++--- DQMOffline/Trigger/plugins/LepHTMonitor.cc | 8 -------- DQMOffline/Trigger/plugins/LepHTMonitor.h | 2 -- .../plugins/TagAndProbeBtagTriggerMonitor.cc | 1 - .../plugins/TagAndProbeBtagTriggerMonitor.h | 1 - DQMServices/Core/interface/DQMEDAnalyzer.h | 6 ------ DQMServices/Examples/interface/DQMExample_Step1.h | 1 - DQMServices/Examples/src/DQMExample_Step1.cc | 4 ---- HLTriggerOffline/Egamma/interface/EmDQM.h | 4 ++-- .../Exotica/interface/HLTExoticaValidator.h | 4 ++-- .../Higgs/interface/HLTHiggsValidator.h | 1 - HLTriggerOffline/Higgs/src/HLTHiggsValidator.cc | 9 --------- HLTriggerOffline/Muon/src/HLTMuonValidator.cc | 8 -------- .../SUSYBSM/interface/SUSY_HLT_DiJet_MET.h | 1 - .../interface/SUSY_HLT_DoubleEle_Hadronic.h | 1 - .../interface/SUSY_HLT_DoubleMuon_Hadronic.h | 1 - .../SUSYBSM/interface/SUSY_HLT_ElecFakes.h | 1 - .../SUSYBSM/interface/SUSY_HLT_Electron_BJet.h | 1 - .../SUSYBSM/interface/SUSY_HLT_InclusiveHT.h | 2 -- .../SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h | 1 - .../SUSYBSM/interface/SUSY_HLT_MuonFakes.h | 1 - .../SUSYBSM/interface/SUSY_HLT_Muon_BJet.h | 1 - .../SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h | 1 - .../SUSYBSM/interface/SUSY_HLT_PhotonHT.h | 2 -- .../SUSYBSM/interface/SUSY_HLT_PhotonMET.h | 2 -- .../SUSYBSM/interface/SUSY_HLT_Razor.h | 2 -- .../SUSYBSM/interface/SUSY_HLT_SingleLepton.h | 1 - .../SUSYBSM/interface/SUSY_HLT_VBF_Mu.h | 1 - .../SUSYBSM/interface/SUSY_HLT_alphaT.h | 1 - HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc | 4 ---- .../SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc | 4 ---- .../SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc | 4 ---- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc | 4 ---- .../SUSYBSM/src/SUSY_HLT_Electron_BJet.cc | 4 ---- .../SUSYBSM/src/SUSY_HLT_InclusiveHT.cc | 8 -------- .../SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc | 4 ---- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc | 4 ---- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc | 4 ---- .../SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc | 4 ---- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc | 8 -------- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc | 8 -------- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc | 8 -------- .../SUSYBSM/src/SUSY_HLT_SingleLepton.cc | 4 ---- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc | 4 ---- HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc | 4 ---- PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc | 1 - SimTracker/SiPhase2Digitizer/test/TBeamTest.cc | 7 ------- .../interface/EcalMixingModuleValidation.h | 6 ++---- .../interface/EcalSelectiveReadoutValidation.h | 4 ++-- .../EventGenerator/interface/BPhysicsSpectrum.h | 1 - .../EventGenerator/interface/BPhysicsValidation.h | 1 - .../EventGenerator/plugins/BPhysicsSpectrum.cc | 2 -- .../EventGenerator/plugins/BPhysicsValidation.cc | 2 -- Validation/HcalDigis/interface/ZDCDigiStudy.h | 4 ++-- Validation/HcalHits/interface/ZdcSimHitStudy.h | 1 - Validation/HcalHits/src/ZdcSimHitStudy.cc | 2 -- Validation/RecoEgamma/plugins/PhotonValidator.h | 4 ++-- .../RecoEgamma/plugins/PhotonValidatorMiniAOD.cc | 4 ---- .../RecoEgamma/plugins/PhotonValidatorMiniAOD.h | 2 -- Validation/RecoEgamma/plugins/TkConvValidator.h | 4 ++-- Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h | 12 +++--------- .../RecoMuon/src/MuonTrackResidualAnalyzer.h | 8 ++------ Validation/RecoMuon/src/RecoMuonValidator.h | 6 ++---- .../RecoParticleFlow/plugins/OffsetAnalyzerDQM.cc | 2 -- .../plugins/Phase2TrackerValidateDigi.cc | 4 ---- .../plugins/Phase2TrackerValidateDigi.h | 1 - 153 files changed, 45 insertions(+), 438 deletions(-) diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc index f9e8298664f7f..612de8b6ded8c 100644 --- a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc @@ -75,7 +75,6 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer globalBeginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) const override; void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; - void dqmEndRun(const edm::Run&, const edm::EventSetup&) override; private: // Constants @@ -1194,8 +1193,4 @@ void CTPPSDiamondDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock& //---------------------------------------------------------------------------------------------------- -void CTPPSDiamondDQMSource::dqmEndRun(const edm::Run&, const edm::EventSetup&) {} - -//---------------------------------------------------------------------------------------------------- - DEFINE_FWK_MODULE(CTPPSDiamondDQMSource); diff --git a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc index d1a12ebab4743..e98c1099a828e 100644 --- a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc +++ b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc @@ -38,7 +38,6 @@ class CTPPSPixelDQMSource : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: unsigned int verbosity; @@ -639,14 +638,5 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const LogPrint("CTPPSPixelDQMSource") << "analyze event " << nEvents; } -//----------------------------------------------------------------------------- -void CTPPSPixelDQMSource::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - if (!verbosity) - return; - LogPrint("CTPPSPixelDQMSource") << "end of Run " << run.run() << ": " << nEvents << " events\n" - << "multHitsMax= " << multHitsMax << " cluSizeMax= " << cluSizeMax - << "\nx0: " << x0_MIN << "/" << x0_MAX << "y0: " << y0_MIN << "/" << y0_MAX << "\n"; -} - //--------------------------------------------------------------------------- DEFINE_FWK_MODULE(CTPPSPixelDQMSource); diff --git a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc index 80c4dda4e4347..3b0edf9976c3b 100644 --- a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc +++ b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc @@ -58,7 +58,6 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer globalBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) const override; void globalEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override; - void dqmEndRun(const edm::Run &, const edm::EventSetup &) override; private: // Constants @@ -779,10 +778,4 @@ void TotemTimingDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock & } } -//---------------------------------------------------------------------------------------------------- - -void TotemTimingDQMSource::dqmEndRun(const edm::Run &, const edm::EventSetup &) {} - -//---------------------------------------------------------------------------------------------------- - DEFINE_FWK_MODULE(TotemTimingDQMSource); diff --git a/DQM/CastorMonitor/interface/CastorMonitorModule.h b/DQM/CastorMonitor/interface/CastorMonitorModule.h index ad8dc5ca96ece..28f9edfe715e2 100644 --- a/DQM/CastorMonitor/interface/CastorMonitorModule.h +++ b/DQM/CastorMonitor/interface/CastorMonitorModule.h @@ -15,7 +15,7 @@ #include "DataFormats/L1Trigger/interface/BXVector.h" #include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h" @@ -39,13 +39,6 @@ #include "DataFormats/CastorReco/interface/CastorCluster.h" #include "DataFormats/CastorReco/interface/CastorJet.h" #include "DataFormats/CastorReco/interface/CastorTower.h" -#include "DataFormats/JetReco/interface/BasicJet.h" -#include "DataFormats/JetReco/interface/BasicJetCollection.h" -#include "DataFormats/JetReco/interface/CastorJetID.h" -#include "DataFormats/JetReco/interface/Jet.h" -#include "RecoJets/JetProducers/interface/CastorJetIDHelper.h" -#include "RecoJets/JetProducers/plugins/CastorJetIDProducer.h" - #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h" @@ -69,7 +62,7 @@ #include #include -class CastorMonitorModule : public DQMEDAnalyzer { +class CastorMonitorModule : public DQMOneEDAnalyzer<> { public: CastorMonitorModule(const edm::ParameterSet &ps); ~CastorMonitorModule() override; diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc index e7dd53b42e4b9..b680411166954 100644 --- a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc +++ b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc @@ -94,7 +94,6 @@ class HLTObjectMonitor : public DQMEDAnalyzer { void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; - void dqmEndRun(edm::Run const&, edm::EventSetup const&) override; vector plotList; //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; @@ -791,11 +790,6 @@ void HLTObjectMonitor::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& // ------------ method called when ending the processing of a run ------------ -void HLTObjectMonitor::dqmEndRun(edm::Run const&, edm::EventSetup const&) { - if (debugPrint) - std::cout << "Calling endRun. " << std::endl; -} - void HLTObjectMonitor::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) { //////////////////////////////// /// diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc index 75a2be68c76f7..e79b9d8ee56e4 100644 --- a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc +++ b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc @@ -93,7 +93,6 @@ class HLTObjectMonitorProtonLead : public DQMEDAnalyzer { void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; - void dqmEndRun(edm::Run const&, edm::EventSetup const&) override; vector plotList; //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; @@ -608,11 +607,6 @@ void HLTObjectMonitorProtonLead::dqmBeginRun(edm::Run const& iRun, edm::EventSet // ------------ method called when ending the processing of a run ------------ -void HLTObjectMonitorProtonLead::dqmEndRun(edm::Run const&, edm::EventSetup const&) { - if (debugPrint) - std::cout << "Calling endRun. " << std::endl; -} - void HLTObjectMonitorProtonLead::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) { diff --git a/DQM/L1TMonitor/interface/BxTiming.h b/DQM/L1TMonitor/interface/BxTiming.h index 02eb51e1a6ce7..ebe26f3e16ae3 100644 --- a/DQM/L1TMonitor/interface/BxTiming.h +++ b/DQM/L1TMonitor/interface/BxTiming.h @@ -36,7 +36,6 @@ class BxTiming : public DQMEDAnalyzer { ~BxTiming() override; protected: - void dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override; void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override; diff --git a/DQM/L1TMonitor/interface/L1ExtraDQM.h b/DQM/L1TMonitor/interface/L1ExtraDQM.h index 0f4ce52db6d1b..69311a3f12f00 100644 --- a/DQM/L1TMonitor/interface/L1ExtraDQM.h +++ b/DQM/L1TMonitor/interface/L1ExtraDQM.h @@ -66,12 +66,12 @@ #include "DQMServices/Core/interface/DQMStore.h" #include "boost/lexical_cast.hpp" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" // forward declarations // class declaration -class L1ExtraDQM : public DQMEDAnalyzer { +class L1ExtraDQM : public DQMOneEDAnalyzer<> { public: // constructor(s) explicit L1ExtraDQM(const edm::ParameterSet&); diff --git a/DQM/L1TMonitor/interface/L1GtHwValidation.h b/DQM/L1TMonitor/interface/L1GtHwValidation.h index ba7b298925ddb..e095a871d78b3 100644 --- a/DQM/L1TMonitor/interface/L1GtHwValidation.h +++ b/DQM/L1TMonitor/interface/L1GtHwValidation.h @@ -105,7 +105,6 @@ class L1GtHwValidation : public DQMEDAnalyzer { protected: void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override; - 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/L1TCSCTF.h b/DQM/L1TMonitor/interface/L1TCSCTF.h index 63375a077b6c2..e0b004ab77f36 100644 --- a/DQM/L1TMonitor/interface/L1TCSCTF.h +++ b/DQM/L1TMonitor/interface/L1TCSCTF.h @@ -66,8 +66,6 @@ class L1TCSCTF : public DQMEDAnalyzer { protected: // Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - //virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&); void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TCSCTPG.h b/DQM/L1TMonitor/interface/L1TCSCTPG.h index 4037dd08fed8b..7697f393a8c3e 100644 --- a/DQM/L1TMonitor/interface/L1TCSCTPG.h +++ b/DQM/L1TMonitor/interface/L1TCSCTPG.h @@ -49,7 +49,6 @@ class L1TCSCTPG : public DQMEDAnalyzer { protected: // Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TDEMON.h b/DQM/L1TMonitor/interface/L1TDEMON.h index f3b838470e588..ec4e0c8d6f667 100644 --- a/DQM/L1TMonitor/interface/L1TDEMON.h +++ b/DQM/L1TMonitor/interface/L1TDEMON.h @@ -31,9 +31,7 @@ class L1TDEMON : public DQMEDAnalyzer { ~L1TDEMON() override; protected: - //virtual void beginJob(void) ; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TGCT.h b/DQM/L1TMonitor/interface/L1TGCT.h index 5143aec3d2525..09e3a6f9ca94d 100644 --- a/DQM/L1TMonitor/interface/L1TGCT.h +++ b/DQM/L1TMonitor/interface/L1TGCT.h @@ -128,7 +128,6 @@ class L1TGCT : public DQMEDAnalyzer { // Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TGMT.h b/DQM/L1TMonitor/interface/L1TGMT.h index 8142a6c6d64ed..032e29f488e5b 100644 --- a/DQM/L1TMonitor/interface/L1TGMT.h +++ b/DQM/L1TMonitor/interface/L1TGMT.h @@ -51,9 +51,6 @@ class L1TGMT : public DQMEDAnalyzer { // Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - // BeginJob - - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQM/L1TMonitor/interface/L1THIonImp.h b/DQM/L1TMonitor/interface/L1THIonImp.h index 44cca68cfc118..5e6e510a16cb3 100644 --- a/DQM/L1TMonitor/interface/L1THIonImp.h +++ b/DQM/L1TMonitor/interface/L1THIonImp.h @@ -27,7 +27,6 @@ class L1THIonImp : public DQMEDAnalyzer { // Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) 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 733299d266700..8c3ef7c9f6179 100644 --- a/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h +++ b/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h @@ -25,7 +25,6 @@ class L1TMP7ZeroSupp : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: - void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event& e, const edm::EventSetup& c) override; diff --git a/DQM/L1TMonitor/interface/L1TPUM.h b/DQM/L1TMonitor/interface/L1TPUM.h index 8170307af7734..2eab6cb2a5fbf 100644 --- a/DQM/L1TMonitor/interface/L1TPUM.h +++ b/DQM/L1TMonitor/interface/L1TPUM.h @@ -30,7 +30,6 @@ class L1TPUM : public DQMEDAnalyzer { protected: void analyze(const edm::Event& e, const edm::EventSetup& c) override; void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; private: edm::EDGetTokenT regionSource_; diff --git a/DQM/L1TMonitor/interface/L1TStage2BMTF.h b/DQM/L1TMonitor/interface/L1TStage2BMTF.h index 9afe8394e621f..61abcbcc01a0f 100644 --- a/DQM/L1TMonitor/interface/L1TStage2BMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2BMTF.h @@ -60,7 +60,6 @@ class L1TStage2BMTF : public DQMEDAnalyzer { // member functions protected: void analyze(const edm::Event&, const edm::EventSetup&) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; // data members diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h index 5dcc1e0b43a91..0372f47ff3d9f 100644 --- a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h +++ b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h @@ -85,7 +85,6 @@ class L1TStage2CaloLayer1 : public DQMOneEDAnalyzer l1IsoEm; edm::Handle l1NonIsoEm; diff --git a/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc b/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc index 5b9e4b09818db..52f745974607c 100644 --- a/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc +++ b/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc @@ -71,8 +71,6 @@ void L1TMP7ZeroSupp::fillDescriptions(edm::ConfigurationDescriptions& descriptio descriptions.add("l1tMP7ZeroSupp", desc); } -void L1TMP7ZeroSupp::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TMP7ZeroSupp::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { // overall summary ibooker.setCurrentFolder(monitorDir_); diff --git a/DQM/L1TMonitor/src/L1TPUM.cc b/DQM/L1TMonitor/src/L1TPUM.cc index b518d94b0ce37..7208f767537b8 100644 --- a/DQM/L1TMonitor/src/L1TPUM.cc +++ b/DQM/L1TMonitor/src/L1TPUM.cc @@ -32,8 +32,6 @@ L1TPUM::L1TPUM(const edm::ParameterSet& ps) L1TPUM::~L1TPUM() {} -void L1TPUM::dqmBeginRun(const edm::Run&, const edm::EventSetup&) {} - void L1TPUM::analyze(const edm::Event& event, const edm::EventSetup& es) { edm::Handle regionCollection; event.getByToken(regionSource_, regionCollection); diff --git a/DQM/L1TMonitor/src/L1TStage2BMTF.cc b/DQM/L1TMonitor/src/L1TStage2BMTF.cc index ec1115b775351..1c14e4031c1ec 100644 --- a/DQM/L1TMonitor/src/L1TStage2BMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2BMTF.cc @@ -22,8 +22,6 @@ L1TStage2BMTF::L1TStage2BMTF(const edm::ParameterSet& ps) L1TStage2BMTF::~L1TStage2BMTF() {} -void L1TStage2BMTF::dqmBeginRun(const edm::Run& iRrun, const edm::EventSetup& eveSetup) {} - void L1TStage2BMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run& iRun, const edm::EventSetup& eveSetup) { std::string histoPrefix = "bmtf"; if (kalman) { diff --git a/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc b/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc index 842f85447f75d..8fe9c7353f79a 100644 --- a/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc +++ b/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc @@ -36,8 +36,6 @@ L1TStage2CaloLayer1::L1TStage2CaloLayer1(const edm::ParameterSet& ps) L1TStage2CaloLayer1::~L1TStage2CaloLayer1() {} -void L1TStage2CaloLayer1::dqmBeginRun(const edm::Run&, const edm::EventSetup&) {} - void L1TStage2CaloLayer1::analyze(const edm::Event& event, const edm::EventSetup& es) { // Monitorables stored in Layer 1 raw data but // not accessible from existing persistent data formats diff --git a/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc b/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc index 70f393e1f0471..c720b23be00e3 100644 --- a/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc +++ b/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc @@ -343,5 +343,3 @@ void L1TStage2CaloLayer2::analyze(const edm::Event& e, const edm::EventSetup& c) } } } - -void L1TStage2CaloLayer2::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) {} diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index fc30fee76a8f3..cb3104bf2cb50 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -15,8 +15,6 @@ L1TStage2EMTF::L1TStage2EMTF(const edm::ParameterSet& ps) L1TStage2EMTF::~L1TStage2EMTF() {} -void L1TStage2EMTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { // Monitor Dir ibooker.setCurrentFolder(monitorDir); diff --git a/DQM/L1TMonitor/src/L1TStage2MuonComp.cc b/DQM/L1TMonitor/src/L1TStage2MuonComp.cc index 1c085293a57ef..db3e57a4f5962 100644 --- a/DQM/L1TMonitor/src/L1TStage2MuonComp.cc +++ b/DQM/L1TMonitor/src/L1TStage2MuonComp.cc @@ -43,8 +43,6 @@ void L1TStage2MuonComp::fillDescriptions(edm::ConfigurationDescriptions& descrip descriptions.add("l1tStage2MuonComp", desc); } -void L1TStage2MuonComp::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TStage2MuonComp::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { // Subsystem Monitoring and Muon Output ibooker.setCurrentFolder(monitorDir); diff --git a/DQM/L1TMonitor/src/L1TStage2OMTF.cc b/DQM/L1TMonitor/src/L1TStage2OMTF.cc index 0ea90efd3a4ec..33fc4d1f34b54 100644 --- a/DQM/L1TMonitor/src/L1TStage2OMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2OMTF.cc @@ -16,8 +16,6 @@ L1TStage2OMTF::L1TStage2OMTF(const edm::ParameterSet& ps) L1TStage2OMTF::~L1TStage2OMTF() {} -void L1TStage2OMTF::dqmBeginRun(const edm::Run& iRrun, const edm::EventSetup& eveSetup) {} - void L1TStage2OMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run& iRun, const edm::EventSetup& eveSetup) { ibooker.setCurrentFolder(monitorDir); diff --git a/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc b/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc index 86109248f7f27..fd2e350571e3e 100644 --- a/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc +++ b/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc @@ -45,8 +45,6 @@ void L1TStage2RegionalMuonCandComp::fillDescriptions(edm::ConfigurationDescripti descriptions.add("l1tStage2RegionalMuonCandComp", desc); } -void L1TStage2RegionalMuonCandComp::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TStage2RegionalMuonCandComp::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TStage2uGMT.cc b/DQM/L1TMonitor/src/L1TStage2uGMT.cc index 931c75132bf86..d2b1dd28ecf99 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGMT.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGMT.cc @@ -32,8 +32,6 @@ void L1TStage2uGMT::fillDescriptions(edm::ConfigurationDescriptions& description descriptions.add("l1tStage2uGMT", desc); } -void L1TStage2uGMT::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TStage2uGMT::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { if (!emul) { // BMTF Input diff --git a/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc b/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc index dd7b1aa1d333b..07b55f9789ca8 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc @@ -20,8 +20,6 @@ void L1TStage2uGMTMuon::fillDescriptions(edm::ConfigurationDescriptions& descrip descriptions.add("l1tStage2uGMTMuon", desc); } -void L1TStage2uGMTMuon::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TStage2uGMTMuon::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { // Subsystem Monitoring and Muon Output ibooker.setCurrentFolder(monitorDir); diff --git a/DQM/L1TMonitor/src/L1TdeCSCTF.cc b/DQM/L1TMonitor/src/L1TdeCSCTF.cc index b7e28043959b7..d4ce91fb7992b 100644 --- a/DQM/L1TMonitor/src/L1TdeCSCTF.cc +++ b/DQM/L1TMonitor/src/L1TdeCSCTF.cc @@ -82,8 +82,6 @@ L1TdeCSCTF::L1TdeCSCTF(ParameterSet const& pset) { */ my_dtrc = std::make_unique(); } -void L1TdeCSCTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TdeCSCTF::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) { //Histograms booking diff --git a/DQM/L1TMonitor/src/L1TdeGCT.cc b/DQM/L1TMonitor/src/L1TdeGCT.cc index 1780cb919c3ec..47af6d219c578 100644 --- a/DQM/L1TMonitor/src/L1TdeGCT.cc +++ b/DQM/L1TMonitor/src/L1TdeGCT.cc @@ -34,8 +34,6 @@ L1TdeGCT::L1TdeGCT(const edm::ParameterSet& iConfig) { L1TdeGCT::~L1TdeGCT() {} -void L1TdeGCT::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& evSetup) {} - void L1TdeGCT::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) { int rnkNBins = 63; double rnkMinim = 0.5; diff --git a/DQM/L1TMonitor/src/L1TdeStage2CaloLayer1.cc b/DQM/L1TMonitor/src/L1TdeStage2CaloLayer1.cc index 885e1e381ddea..3eabbf9a19452 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2CaloLayer1.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2CaloLayer1.cc @@ -34,8 +34,6 @@ L1TdeStage2CaloLayer1::L1TdeStage2CaloLayer1(const edm::ParameterSet& ps) L1TdeStage2CaloLayer1::~L1TdeStage2CaloLayer1() {} -void L1TdeStage2CaloLayer1::dqmBeginRun(const edm::Run&, const edm::EventSetup&) {} - void L1TdeStage2CaloLayer1::analyze(const edm::Event& event, const edm::EventSetup& es) { edm::Handle dataTowers; event.getByToken(dataSource_, dataTowers); diff --git a/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc b/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc index 56b0a23217e66..842fa02336bdb 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc @@ -10,8 +10,6 @@ L1TdeStage2EMTF::L1TdeStage2EMTF(const edm::ParameterSet& ps) L1TdeStage2EMTF::~L1TdeStage2EMTF() {} -void L1TdeStage2EMTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void L1TdeStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { ibooker.setCurrentFolder(monitorDir); diff --git a/DQM/L1TMonitor/src/L1TdeStage2uGT.cc b/DQM/L1TMonitor/src/L1TdeStage2uGT.cc index dbf9d76453e65..3536d0a170a8a 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2uGT.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2uGT.cc @@ -40,8 +40,6 @@ L1TdeStage2uGT::L1TdeStage2uGT(const edm::ParameterSet& ps) L1TdeStage2uGT::~L1TdeStage2uGT() {} -void L1TdeStage2uGT::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& evtSetup) {} - void L1TdeStage2uGT::analyze(const edm::Event& event, const edm::EventSetup& es) { edm::Handle dataCollection; event.getByToken(dataSource_, dataCollection); diff --git a/DQM/Physics/src/EwkElecDQM.h b/DQM/Physics/src/EwkElecDQM.h index 1c18e9713a6a2..47ba9ef6c13b3 100644 --- a/DQM/Physics/src/EwkElecDQM.h +++ b/DQM/Physics/src/EwkElecDQM.h @@ -15,7 +15,7 @@ #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h" #include "DataFormats/VertexReco/interface/VertexFwd.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" namespace reco { @@ -24,7 +24,7 @@ namespace reco { class BeamSpot; } // namespace reco -class EwkElecDQM : public DQMEDAnalyzer { +class EwkElecDQM : public DQMOneEDAnalyzer<> { public: EwkElecDQM(const edm::ParameterSet&); diff --git a/DQM/Physics/src/EwkMuDQM.cc b/DQM/Physics/src/EwkMuDQM.cc index 3cdb24c6d0e54..8104c78b597ad 100644 --- a/DQM/Physics/src/EwkMuDQM.cc +++ b/DQM/Physics/src/EwkMuDQM.cc @@ -240,8 +240,6 @@ void EwkMuDQM::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm:: phEta_ = ibooker.book1D("phEta", chtitle, 100, -2.5, 2.5); } -void EwkMuDQM::dqmEndRun(const Run& r, const EventSetup& iSet) {} - void EwkMuDQM::analyze(const Event& ev, const EventSetup& iSet) { // Muon collection Handle > muonCollection; diff --git a/DQM/Physics/src/EwkMuDQM.h b/DQM/Physics/src/EwkMuDQM.h index 1291661d03623..55cdb4870fe73 100644 --- a/DQM/Physics/src/EwkMuDQM.h +++ b/DQM/Physics/src/EwkMuDQM.h @@ -34,7 +34,6 @@ class EwkMuDQM : public DQMEDAnalyzer { //Book histograms void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void dqmEndRun(const edm::Run&, const edm::EventSetup&) override; void init_histograms(); diff --git a/DQM/Physics/src/EwkMuLumiMonitorDQM.cc b/DQM/Physics/src/EwkMuLumiMonitorDQM.cc index 3748c3204d695..a2f73820ed250 100644 --- a/DQM/Physics/src/EwkMuLumiMonitorDQM.cc +++ b/DQM/Physics/src/EwkMuLumiMonitorDQM.cc @@ -182,20 +182,6 @@ bool EwkMuLumiMonitorDQM::IsMuMatchedToHLTMu(const reco::Muon& mu, return (nPass > 0); } -void EwkMuLumiMonitorDQM::dqmEndRun(const Run& r, const EventSetup&) { - LogVerbatim("") << "\n>>>>>> Z/W SELECTION SUMMARY BEGIN >>>>>>>>>>>>>>>"; - LogVerbatim("") << "Total numer of events analyzed: " << nall << " [events]"; - LogVerbatim("") << "Total numer of events selected: " << nsel << " [events]"; - - LogVerbatim("") << "Passing HLT criteria: " << nhlt << " [events] "; - LogVerbatim("") << "Passing 2 HLT match criteria: " << n2hlt << " [events] "; - LogVerbatim("") << "Passing 1 HLT match criteria: " << n1hlt << " [events] "; - LogVerbatim("") << "Passing Not Iso criteria: " << nNotIso << " [events] "; - LogVerbatim("") << "Passing GlbSta criteria: " << nGlbSta << " [events] "; - LogVerbatim("") << "Passing W criteria: " << nTMass << " [events] "; - LogVerbatim("") << ">>>>>> Z/W SELECTION SUMMARY END >>>>>>>>>>>>>>>\n"; -} - void EwkMuLumiMonitorDQM::analyze(const Event& ev, const EventSetup&) { nall++; bool hlt_sel = false; diff --git a/DQM/Physics/src/EwkMuLumiMonitorDQM.h b/DQM/Physics/src/EwkMuLumiMonitorDQM.h index 0450253344a67..0e5cba30ebce9 100644 --- a/DQM/Physics/src/EwkMuLumiMonitorDQM.h +++ b/DQM/Physics/src/EwkMuLumiMonitorDQM.h @@ -40,7 +40,6 @@ class EwkMuLumiMonitorDQM : public DQMEDAnalyzer { //Book histograms void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void dqmEndRun(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 0d3391da19104..3bbb4724e7f5e 100644 --- a/DQM/Physics/src/EwkTauDQM.h +++ b/DQM/Physics/src/EwkTauDQM.h @@ -15,7 +15,7 @@ * Christian Veelken */ -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include @@ -24,7 +24,7 @@ class EwkElecTauHistManager; class EwkMuTauHistManager; -class EwkTauDQM : public DQMEDAnalyzer { +class EwkTauDQM : public DQMOneEDAnalyzer<> { public: EwkTauDQM(const edm::ParameterSet&); ~EwkTauDQM() override; diff --git a/DQM/Physics/src/HiggsDQM.cc b/DQM/Physics/src/HiggsDQM.cc index 113f9b14a8285..3ebc00fa3305d 100644 --- a/DQM/Physics/src/HiggsDQM.cc +++ b/DQM/Physics/src/HiggsDQM.cc @@ -570,18 +570,6 @@ void HiggsDQM::analyze(const edm::Event& e, const edm::EventSetup& eSetup) { LogDebug("HiggsDQM") << "WARNING: " << nMu + nEle << " leptons in this event: run=" << e.id().run() << ", event=" << e.id().event() << "\n"; } -// -// -- End Run -// -void HiggsDQM::dqmEndRun(edm::Run const& run, edm::EventSetup const& eSetup) { - // cout<<"Entering HiggsDQM::endRun: "< { private: void analyze(const edm::Event &, const edm::EventSetup &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; - void dqmEndRun(edm::Run const &, edm::EventSetup const &) override; void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override; void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override; diff --git a/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc index c68b98ce7dfd5..349d39a98c076 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripCMMonitor.cc @@ -72,8 +72,6 @@ class SiStripCMMonitorPlugin : public DQMEDAnalyzer { 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&) override; - //update the cabling if necessary void updateCabling(const edm::EventSetup& eventSetup); @@ -181,8 +179,6 @@ void SiStripCMMonitorPlugin::bookHistograms(DQMStore::IBooker& ibooker, cmHists_.bookAllFEDHistograms(ibooker); } -void SiStripCMMonitorPlugin::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - // ------------ method called to for each event ------------ void SiStripCMMonitorPlugin::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc index 97364bfe99eef..57e3f6a020cf4 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDDataCheck.cc @@ -44,13 +44,13 @@ #include "DQM/SiStripMonitorHardware/interface/FEDErrors.hh" -#include +#include // // Class declaration // -class SiStripFEDCheckPlugin : public DQMEDAnalyzer { +class SiStripFEDCheckPlugin : public DQMOneEDAnalyzer<> { public: explicit SiStripFEDCheckPlugin(const edm::ParameterSet&); ~SiStripFEDCheckPlugin() override; diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h index e406d20b4c138..914474cf6133f 100644 --- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h +++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h @@ -41,7 +41,7 @@ #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" -#include +#include #include "DQMServices/Core/interface/DQMStore.h" #include @@ -51,7 +51,7 @@ class ApvAnalysisFactory; class SiStripDetCabling; -class SiStripMonitorPedestals : public DQMEDAnalyzer { +class SiStripMonitorPedestals : public DQMOneEDAnalyzer<> { public: explicit SiStripMonitorPedestals(const edm::ParameterSet &); ~SiStripMonitorPedestals() override; diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h index 8dd765393e156..75695d14b5fe5 100644 --- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h +++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h @@ -31,7 +31,7 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include +#include #include "DQMServices/Core/interface/DQMStore.h" #include @@ -43,7 +43,7 @@ class SiStripDetCabling; class SiStripQuality; class TrackerTopology; -class SiStripMonitorQuality : public DQMEDAnalyzer { +class SiStripMonitorQuality : public DQMOneEDAnalyzer<> { public: explicit SiStripMonitorQuality(const edm::ParameterSet &); ~SiStripMonitorQuality() override; diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h index 869efd81d4863..2699065aa9d7a 100644 --- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h +++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h @@ -35,7 +35,7 @@ #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h" -#include +#include #include "DQMServices/Core/interface/DQMStore.h" #include @@ -45,7 +45,7 @@ class SiStripDetCabling; -class SiStripMonitorRawData : public DQMEDAnalyzer { +class SiStripMonitorRawData : public DQMOneEDAnalyzer<> { public: explicit SiStripMonitorRawData(const edm::ParameterSet &); ~SiStripMonitorRawData() override; diff --git a/DQM/TrackingMonitor/interface/LogMessageMonitor.h b/DQM/TrackingMonitor/interface/LogMessageMonitor.h index 72469deade080..35414cbcadd2e 100644 --- a/DQM/TrackingMonitor/interface/LogMessageMonitor.h +++ b/DQM/TrackingMonitor/interface/LogMessageMonitor.h @@ -61,9 +61,6 @@ class LogMessageMonitor : public DQMEDAnalyzer { void analyze(const edm::Event&, const edm::EventSetup&) override; void endJob() override; - // virtual void beginRun(edm::Run const&, edm::EventSetup const&); - void dqmEndRun(edm::Run const&, edm::EventSetup const&) override; - void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; // ----------member data --------------------------- diff --git a/DQM/TrackingMonitor/src/LogMessageMonitor.cc b/DQM/TrackingMonitor/src/LogMessageMonitor.cc index d303b18bb3acb..52c8b282dee50 100644 --- a/DQM/TrackingMonitor/src/LogMessageMonitor.cc +++ b/DQM/TrackingMonitor/src/LogMessageMonitor.cc @@ -269,17 +269,6 @@ void LogMessageMonitor::endJob() { } } -/* -// ------------ method called when starting to processes a run ------------ -void -LogMessageMonitor::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) -{ - -} -*/ -// ------------ method called when ending the processing of a run ------------ -void LogMessageMonitor::dqmEndRun(edm::Run const&, edm::EventSetup const&) {} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void LogMessageMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { //The following says we do not know what parameters are allowed so do no validation diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h index c42bbf70b7a5c..29e91e3b9ec45 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h +++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h @@ -13,12 +13,12 @@ #include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h" -class DQMHcalPhiSymAlCaReco : public DQMEDAnalyzer { +class DQMHcalPhiSymAlCaReco : public DQMOneEDAnalyzer<> { public: DQMHcalPhiSymAlCaReco(const edm::ParameterSet &); ~DQMHcalPhiSymAlCaReco() override; diff --git a/DQMOffline/JetMET/interface/DQMPFCandidateAnalyzer.h b/DQMOffline/JetMET/interface/DQMPFCandidateAnalyzer.h index f228108890233..9f94aaafb5ece 100644 --- a/DQMOffline/JetMET/interface/DQMPFCandidateAnalyzer.h +++ b/DQMOffline/JetMET/interface/DQMPFCandidateAnalyzer.h @@ -77,9 +77,6 @@ class DQMPFCandidateAnalyzer : public DQMEDAnalyzer { /// Initialize run-based parameters void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - /// Finish up a run - void dqmEndRun(const edm::Run&, const edm::EventSetup&) override; - private: // ----------member data --------------------------- static bool jetSortingRule(reco::Jet x, reco::Jet y) { return x.pt() > y.pt(); } diff --git a/DQMOffline/JetMET/interface/JetAnalyzer.h b/DQMOffline/JetMET/interface/JetAnalyzer.h index 50b49bdef5f65..2d2603b5d320d 100644 --- a/DQMOffline/JetMET/interface/JetAnalyzer.h +++ b/DQMOffline/JetMET/interface/JetAnalyzer.h @@ -95,9 +95,6 @@ class JetAnalyzer : public DQMEDAnalyzer { /// Initialize run-based parameters void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - /// Finish up a run - void dqmEndRun(const edm::Run&, const edm::EventSetup&) override; - private: // ----------member data --------------------------- static bool jetSortingRule(reco::Jet x, reco::Jet y) { return x.pt() > y.pt(); } diff --git a/DQMOffline/JetMET/interface/METAnalyzer.h b/DQMOffline/JetMET/interface/METAnalyzer.h index 556c883835c2d..b441182326764 100644 --- a/DQMOffline/JetMET/interface/METAnalyzer.h +++ b/DQMOffline/JetMET/interface/METAnalyzer.h @@ -73,7 +73,7 @@ #include "DQMOffline/JetMET/interface/JetMETDQMDCSFilter.h" #include "PhysicsTools/SelectorUtils/interface/JetIDSelectionFunctor.h" #include "PhysicsTools/SelectorUtils/interface/PFJetIDSelectionFunctor.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DataFormats/MuonReco/interface/Muon.h" #include "CondFormats/L1TObjects/interface/L1GtTriggerMenuFwd.h" @@ -86,7 +86,7 @@ #include #include -class METAnalyzer : public DQMEDAnalyzer { +class METAnalyzer : public DQMOneEDAnalyzer<> { public: /// Constructor METAnalyzer(const edm::ParameterSet&); diff --git a/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc b/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc index 63e86651701c5..991c87c7a6714 100644 --- a/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc +++ b/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc @@ -662,9 +662,6 @@ void DQMPFCandidateAnalyzer::dqmBeginRun(const edm::Run& iRun, const edm::EventS } } -// *********************************************************** -void DQMPFCandidateAnalyzer::dqmEndRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {} - // *********************************************************** void DQMPFCandidateAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //Vertex information diff --git a/DQMOffline/JetMET/src/JetAnalyzer.cc b/DQMOffline/JetMET/src/JetAnalyzer.cc index c73faa7ca4d4c..f9fc6f234a507 100644 --- a/DQMOffline/JetMET/src/JetAnalyzer.cc +++ b/DQMOffline/JetMET/src/JetAnalyzer.cc @@ -2239,9 +2239,6 @@ void JetAnalyzer::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetu } } -// *********************************************************** -void JetAnalyzer::dqmEndRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {} - // *********************************************************** void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { //set general folders first --> change later on for different folders diff --git a/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h b/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h index 4f15216b191ea..3e8ae02033f4a 100644 --- a/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h @@ -12,7 +12,7 @@ #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h" //DQM -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "DQMOffline/L1Trigger/interface/HistDefinition.h" @@ -35,7 +35,7 @@ // stage2 collections: #include "DataFormats/L1Trigger/interface/EGamma.h" -class L1TEGammaOffline : public DQMEDAnalyzer { +class L1TEGammaOffline : public DQMOneEDAnalyzer<> { public: L1TEGammaOffline(const edm::ParameterSet& ps); ~L1TEGammaOffline() override; diff --git a/DQMOffline/L1Trigger/interface/L1TRate_Offline.h b/DQMOffline/L1Trigger/interface/L1TRate_Offline.h index 354c79ce7a956..9f31681c6edf7 100644 --- a/DQMOffline/L1Trigger/interface/L1TRate_Offline.h +++ b/DQMOffline/L1Trigger/interface/L1TRate_Offline.h @@ -55,7 +55,6 @@ class L1TRate_Offline : public DQMOneEDAnalyzer void beginLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; void endLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& c) override; - void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; // Private methods //private: diff --git a/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h b/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h index 1ce01e4c82363..92afc1a06a919 100644 --- a/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h +++ b/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h @@ -86,7 +86,6 @@ class L1TStage2CaloLayer2Offline : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override; - void dqmEndRun(edm::Run const& run, edm::EventSetup const& eSetup) override; void endJob() override; private: diff --git a/DQMOffline/L1Trigger/interface/L1TTauOffline.h b/DQMOffline/L1Trigger/interface/L1TTauOffline.h index 048ef253dab29..e6642964347a8 100644 --- a/DQMOffline/L1Trigger/interface/L1TTauOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TTauOffline.h @@ -85,10 +85,8 @@ class L1TTauOffline : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run& run, const edm::EventSetup& iSetup) override; - /* 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) override; - void dqmEndRun(edm::Run const& run, edm::EventSetup const& eSetup) override; void endJob() override; const reco::Vertex getPrimaryVertex(edm::Handle const& vertex, diff --git a/DQMOffline/L1Trigger/src/L1TRate_Offline.cc b/DQMOffline/L1Trigger/src/L1TRate_Offline.cc index b466e3d7c4471..777233615ad17 100644 --- a/DQMOffline/L1Trigger/src/L1TRate_Offline.cc +++ b/DQMOffline/L1Trigger/src/L1TRate_Offline.cc @@ -209,9 +209,6 @@ void L1TRate_Offline::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run& } } -//_____________________________________________________________________ - -void L1TRate_Offline::dqmBeginRun(edm::Run const&, edm::EventSetup const&) {} //_____________________________________________________________________ void L1TRate_Offline::beginLuminosityBlock(LuminosityBlock const& lumiBlock, EventSetup const& c) { if (m_verbose) { diff --git a/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc b/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc index be16ab1839d9d..a847228ee45de 100644 --- a/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc +++ b/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc @@ -534,10 +534,6 @@ void L1TStage2CaloLayer2Offline::fillJetEfficiencies(const double& recoEt, const // // -------------------------------------- endRun -------------------------------------------- // -void L1TStage2CaloLayer2Offline::dqmEndRun(edm::Run const& run, edm::EventSetup const& eSetup) { - edm::LogInfo("L1TStage2CaloLayer2Offline") << "L1TStage2CaloLayer2Offline::endRun" << std::endl; -} - // // -------------------------------------- book histograms -------------------------------------------- // diff --git a/DQMOffline/L1Trigger/src/L1TTauOffline.cc b/DQMOffline/L1Trigger/src/L1TTauOffline.cc index fcbca0110c563..5ef58a0fd0ba5 100644 --- a/DQMOffline/L1Trigger/src/L1TTauOffline.cc +++ b/DQMOffline/L1Trigger/src/L1TTauOffline.cc @@ -320,10 +320,6 @@ void L1TTauOffline::analyze(edm::Event const& e, edm::EventSetup const& eSetup) // // -------------------------------------- endRun -------------------------------------------- // -void L1TTauOffline::dqmEndRun(edm::Run const& run, edm::EventSetup const& eSetup) { - edm::LogInfo("L1TTauOffline") << "L1TTauOffline::endRun" << std::endl; -} - // // -------------------------------------- book histograms -------------------------------------------- // diff --git a/DQMOffline/Trigger/plugins/HLTMuonOfflineAnalyzer.cc b/DQMOffline/Trigger/plugins/HLTMuonOfflineAnalyzer.cc index 0d754dd033b39..368f71376003e 100644 --- a/DQMOffline/Trigger/plugins/HLTMuonOfflineAnalyzer.cc +++ b/DQMOffline/Trigger/plugins/HLTMuonOfflineAnalyzer.cc @@ -44,7 +44,6 @@ class HLTMuonOfflineAnalyzer : public DQMEDAnalyzer { void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(const edm::Event &, const edm::EventSetup &) override; - void dqmEndRun(const edm::Run &, const edm::EventSetup &) override; // Extra Methods std::vector moduleLabels(const std::string &); @@ -144,9 +143,5 @@ void HLTMuonOfflineAnalyzer::analyze(const Event &iEvent, const EventSetup &iSet plotterContainer_.analyze(iEvent, iSetup); } -void HLTMuonOfflineAnalyzer::dqmEndRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { - // plotterContainer_.endRun(iRun, iSetup); -} - //define this as a plug-in DEFINE_FWK_MODULE(HLTMuonOfflineAnalyzer); diff --git a/DQMOffline/Trigger/plugins/HLTTagAndProbeOfflineSource.cc b/DQMOffline/Trigger/plugins/HLTTagAndProbeOfflineSource.cc index 37b1b867dab0d..4e7c89a1da57e 100644 --- a/DQMOffline/Trigger/plugins/HLTTagAndProbeOfflineSource.cc +++ b/DQMOffline/Trigger/plugins/HLTTagAndProbeOfflineSource.cc @@ -34,7 +34,6 @@ class HLTTagAndProbeOfflineSource : public DQMEDAnalyzer { void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, edm::Run const& run, edm::EventSetup const& c) override; - void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override {} private: std::vector > tagAndProbeEffs_; diff --git a/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc b/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc index bfc87063ad33a..533c737e6e587 100644 --- a/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc +++ b/DQMOffline/Trigger/plugins/HigPhotonJetHLTOfflineSource.cc @@ -14,8 +14,7 @@ #include // user include files -#include "DQMServices/Core/interface/DQMStore.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/ConsumesCollector.h" @@ -43,7 +42,7 @@ #include // Define the interface -class HigPhotonJetHLTOfflineSource : public DQMEDAnalyzer { +class HigPhotonJetHLTOfflineSource : public DQMOneEDAnalyzer<> { public: explicit HigPhotonJetHLTOfflineSource(const edm::ParameterSet&); diff --git a/DQMOffline/Trigger/plugins/LepHTMonitor.cc b/DQMOffline/Trigger/plugins/LepHTMonitor.cc index 0b235b7bb3e4f..05ba44b50b232 100644 --- a/DQMOffline/Trigger/plugins/LepHTMonitor.cc +++ b/DQMOffline/Trigger/plugins/LepHTMonitor.cc @@ -203,10 +203,6 @@ LepHTMonitor::LepHTMonitor(const edm::ParameterSet &ps) LepHTMonitor::~LepHTMonitor() { edm::LogInfo("LepHTMonitor") << "Destructor LepHTMonitor::~LepHTMonitor\n"; } -void LepHTMonitor::dqmBeginRun(const edm::Run &run, const edm::EventSetup &e) { - edm::LogInfo("LepHTMonitor") << "LepHTMonitor::beginRun\n"; -} - void LepHTMonitor::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &iRun, const edm::EventSetup &iSetup) { edm::LogInfo("LepHTMonitor") << "LepHTMonitor::bookHistograms\n"; //book at beginRun @@ -554,9 +550,5 @@ void LepHTMonitor::analyze(const edm::Event &e, const edm::EventSetup &eSetup) { } } -void LepHTMonitor::dqmEndRun(const edm::Run &run, const edm::EventSetup &eSetup) { - edm::LogInfo("LepHTMonitor") << "LepHTMonitor::endRun\n"; -} - //define this as a plug-in DEFINE_FWK_MODULE(LepHTMonitor); diff --git a/DQMOffline/Trigger/plugins/LepHTMonitor.h b/DQMOffline/Trigger/plugins/LepHTMonitor.h index 3655ffa1c1894..7f8417485c926 100644 --- a/DQMOffline/Trigger/plugins/LepHTMonitor.h +++ b/DQMOffline/Trigger/plugins/LepHTMonitor.h @@ -56,10 +56,8 @@ class LepHTMonitor : public DQMEDAnalyzer { ~LepHTMonitor() override; protected: - void dqmBeginRun(const edm::Run& run, const edm::EventSetup& e) override; void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event& e, const edm::EventSetup& eSetup) override; - void dqmEndRun(const edm::Run& run, const edm::EventSetup& eSetup) override; private: //variables from config file diff --git a/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.cc b/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.cc index 717751010d91b..564a910c64ce7 100644 --- a/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.cc +++ b/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.cc @@ -165,7 +165,6 @@ void TagAndProbeBtagTriggerMonitor::analyze(edm::Event const& iEvent, edm::Event } // at least two offline jets } // accept trigger } -void TagAndProbeBtagTriggerMonitor::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {} // Define this as a plug-in #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.h b/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.h index ccd5bac5da9ca..ed6c495b1e7aa 100644 --- a/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.h +++ b/DQMOffline/Trigger/plugins/TagAndProbeBtagTriggerMonitor.h @@ -49,7 +49,6 @@ class TagAndProbeBtagTriggerMonitor : public DQMEDAnalyzer { protected: void analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) override; - void dqmBeginRun(edm::Run const& run, edm::EventSetup const& iSetup) override; void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/DQMServices/Core/interface/DQMEDAnalyzer.h b/DQMServices/Core/interface/DQMEDAnalyzer.h index 10b1c58aa236c..a326c62528a5c 100644 --- a/DQMServices/Core/interface/DQMEDAnalyzer.h +++ b/DQMServices/Core/interface/DQMEDAnalyzer.h @@ -44,13 +44,11 @@ class DQMEDAnalyzer : public edm::one::EDProducer()->cloneLumiHistograms(lumi.run(), lumi.luminosityBlock(), this->moduleDescription().id()); lumi.emplace(lumiToken_); } @@ -60,7 +58,6 @@ class DQMEDAnalyzer : public edm::one::EDProducer()->cloneRunHistograms(run.run(), this->moduleDescription().id()); run.emplace(runToken_); } @@ -72,10 +69,7 @@ class DQMEDAnalyzer : public edm::one::EDProducer runToken_; diff --git a/DQMServices/Examples/interface/DQMExample_Step1.h b/DQMServices/Examples/interface/DQMExample_Step1.h index e98fe6c63ad43..ed757cedac625 100644 --- a/DQMServices/Examples/interface/DQMExample_Step1.h +++ b/DQMServices/Examples/interface/DQMExample_Step1.h @@ -52,7 +52,6 @@ class DQMExample_Step1 : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/DQMServices/Examples/src/DQMExample_Step1.cc b/DQMServices/Examples/src/DQMExample_Step1.cc index a60a830baec2f..fc9ea51abafb6 100644 --- a/DQMServices/Examples/src/DQMExample_Step1.cc +++ b/DQMServices/Examples/src/DQMExample_Step1.cc @@ -282,10 +282,6 @@ void DQMExample_Step1::analyze(edm::Event const &e, edm::EventSetup const &eSetu // -------------------------------------- endRun // -------------------------------------------- // -void DQMExample_Step1::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::endRun" << std::endl; -} - // // -------------------------------------- book histograms // -------------------------------------------- diff --git a/HLTriggerOffline/Egamma/interface/EmDQM.h b/HLTriggerOffline/Egamma/interface/EmDQM.h index 582b997714d81..0e222cd97de72 100644 --- a/HLTriggerOffline/Egamma/interface/EmDQM.h +++ b/HLTriggerOffline/Egamma/interface/EmDQM.h @@ -3,7 +3,7 @@ // Base Class Headers #include "CommonTools/Utils/interface/PtComparator.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "DataFormats/Common/interface/AssociationMap.h" #include "DataFormats/Common/interface/Handle.h" @@ -63,7 +63,7 @@ class HistoFiller { EmDQM *dqm; }; -class EmDQM : public DQMEDAnalyzer { +class EmDQM : public DQMOneEDAnalyzer<> { public: friend class HistoFiller; friend class HistoFiller; diff --git a/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h b/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h index 93ec782a57074..764e3fe2304b2 100644 --- a/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h +++ b/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h @@ -18,7 +18,7 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" #include "HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h" @@ -34,7 +34,7 @@ struct EVTColContainer; /// of one single analysis. Each of those, in turn, books a /// vector if HLTExoticaPlotters to make plots for each /// HLT path -class HLTExoticaValidator : public DQMEDAnalyzer { +class HLTExoticaValidator : public DQMOneEDAnalyzer<> { public: /// Constructor and destructor HLTExoticaValidator(const edm::ParameterSet &); diff --git a/HLTriggerOffline/Higgs/interface/HLTHiggsValidator.h b/HLTriggerOffline/Higgs/interface/HLTHiggsValidator.h index 8e5e69efeb7ae..207b3831a0bdd 100644 --- a/HLTriggerOffline/Higgs/interface/HLTHiggsValidator.h +++ b/HLTriggerOffline/Higgs/interface/HLTHiggsValidator.h @@ -39,7 +39,6 @@ class HLTHiggsValidator : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker &, const edm::Run &, const edm::EventSetup &) override; void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) override; void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override; - void dqmEndRun(const edm::Run &iRun, const edm::EventSetup &iSetup) override; //! Input from configuration file edm::ParameterSet _pset; diff --git a/HLTriggerOffline/Higgs/src/HLTHiggsValidator.cc b/HLTriggerOffline/Higgs/src/HLTHiggsValidator.cc index 26c20dd828cd7..5f0cbc88a7b25 100644 --- a/HLTriggerOffline/Higgs/src/HLTHiggsValidator.cc +++ b/HLTriggerOffline/Higgs/src/HLTHiggsValidator.cc @@ -64,14 +64,5 @@ void HLTHiggsValidator::analyze(const edm::Event& iEvent, const edm::EventSetup& } } -void HLTHiggsValidator::dqmEndRun(const edm::Run& iRun, const edm::EventSetup& iSetup) { - // vector::iterator iter; - // for(std::vector::iterator iter = _analyzers.begin(); - // iter != analyzers_.end(); ++iter) - // { - // iter->endRun(iRun, iSetup); - // } -} - //define this as a plug-in //DEFINE_FWK_MODULE(HLTHiggsValidator); diff --git a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc index 5a4e8a8d84b70..715d4419c08ed 100644 --- a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc +++ b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc @@ -42,7 +42,6 @@ class HLTMuonValidator : public DQMEDAnalyzer { void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(const edm::Event &, const edm::EventSetup &) override; - void dqmEndRun(const edm::Run &, const edm::EventSetup &) override; // Extra Methods std::vector moduleLabels(std::string); @@ -181,12 +180,5 @@ void HLTMuonValidator::analyze(const Event &iEvent, const EventSetup &iSetup) { } } -void HLTMuonValidator::dqmEndRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { - // vector::iterator iter; - // for (iter = analyzers_.begin(); iter != analyzers_.end(); ++iter) { - // iter->endRun(iRun, iSetup); - // } -} - // define this as a plug-in DEFINE_FWK_MODULE(HLTMuonValidator); diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h index 3028eb69edd91..4848631401e01 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h @@ -39,7 +39,6 @@ class SUSY_HLT_DiJet_MET : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h index 837c2c3bcddf0..6dd06363e353c 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h @@ -36,7 +36,6 @@ class SUSY_HLT_DoubleEle_Hadronic : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h index 08a89b0b5b913..a6f16372fb578 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h @@ -33,7 +33,6 @@ class SUSY_HLT_DoubleMuon_Hadronic : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h index e3c1e3e825960..bca588f0d3662 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h @@ -39,7 +39,6 @@ class SUSY_HLT_ElecFakes : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h index b7d6eaa6097a0..9a79b923dd1ba 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h @@ -36,7 +36,6 @@ class SUSY_HLT_Electron_BJet : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h index 92d1b23f889c3..1f13b7d2488fe 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h @@ -29,10 +29,8 @@ class SUSY_HLT_InclusiveHT : public DQMEDAnalyzer { ~SUSY_HLT_InclusiveHT() override; 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) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h index f66c097b086ce..1a2e2c6b3a040 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h @@ -40,7 +40,6 @@ class SUSY_HLT_MuEle_Hadronic : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h index 6fe914753de93..fc2b6af8ab21b 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h @@ -39,7 +39,6 @@ class SUSY_HLT_MuonFakes : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h index 69511f41a7ce2..c85a0c26d1e6b 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h @@ -33,7 +33,6 @@ class SUSY_HLT_Muon_BJet : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h index 9d2bf980b5a3e..8a0fa77f51223 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h @@ -39,7 +39,6 @@ class SUSY_HLT_Muon_Hadronic : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h index df993a6f47ae8..1ea19a8117714 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h @@ -32,10 +32,8 @@ class SUSY_HLT_PhotonHT : public DQMEDAnalyzer { ~SUSY_HLT_PhotonHT() override; 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) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h index 31e0f5ed4a766..c89d84c479e63 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h @@ -32,10 +32,8 @@ class SUSY_HLT_PhotonMET : public DQMEDAnalyzer { ~SUSY_HLT_PhotonMET() override; 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) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h index 9a4a45c4d0d6d..27b28bb1932db 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h @@ -46,10 +46,8 @@ class SUSY_HLT_Razor : public DQMEDAnalyzer { static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); 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) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h index 48258633051b0..75120b7359125 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h @@ -54,7 +54,6 @@ class SUSY_HLT_SingleLepton : public DQMEDAnalyzer { void dqmBeginRun(const edm::Run &run, const edm::EventSetup &e) override; void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) override; void analyze(const edm::Event &e, const edm::EventSetup &eSetup) override; - void dqmEndRun(const edm::Run &run, const edm::EventSetup &eSetup) override; private: // variables from config file diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h index fd18ba7274624..6401d4b6b10a6 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h @@ -39,7 +39,6 @@ class SUSY_HLT_VBF_Mu : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h index c494069efbdca..78a9459ef4c49 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h @@ -41,7 +41,6 @@ class SUSY_HLT_alphaT : public DQMEDAnalyzer { void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override; - void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override; private: // histos booking function diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc index acf2d083f740a..a599c97e72b9d 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc @@ -219,10 +219,6 @@ void SUSY_HLT_DiJet_MET::analyze(edm::Event const &e, edm::EventSetup const &eSe phiJet.clear(); } -void SUSY_HLT_DiJet_MET::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::endRun" << std::endl; -} - void SUSY_HLT_DiJet_MET::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc index 224ce96710517..76ffb2831bbff 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc @@ -229,10 +229,6 @@ void SUSY_HLT_DoubleEle_Hadronic::analyze(edm::Event const &e, edm::EventSetup c } } -void SUSY_HLT_DoubleEle_Hadronic::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::endRun" << std::endl; -} - void SUSY_HLT_DoubleEle_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc index 44a8bef94bf7d..be038b784acf7 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc @@ -219,10 +219,6 @@ void SUSY_HLT_DoubleMuon_Hadronic::analyze(edm::Event const &e, edm::EventSetup } } -void SUSY_HLT_DoubleMuon_Hadronic::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::endRun" << std::endl; -} - void SUSY_HLT_DoubleMuon_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc index 4971be8f75b51..61db747ae2fd9 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc @@ -101,10 +101,6 @@ void SUSY_HLT_ElecFakes::analyze(edm::Event const &e, edm::EventSetup const &eSe } } -void SUSY_HLT_ElecFakes::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::endRun" << std::endl; -} - void SUSY_HLT_ElecFakes::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc index 99779a9bd9804..71ebbd81c32c1 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc @@ -116,10 +116,6 @@ void SUSY_HLT_Electron_BJet::analyze(edm::Event const &e, edm::EventSetup const } } -void SUSY_HLT_Electron_BJet::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::endRun" << std::endl; -} - void SUSY_HLT_Electron_BJet::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc index e023b829adf20..dbdd6b8f1d685 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc @@ -24,10 +24,6 @@ SUSY_HLT_InclusiveHT::~SUSY_HLT_InclusiveHT() { edm::LogInfo("SUSY_HLT_InclusiveHT") << "Destructor SUSY_HLT_InclusiveHT::~SUSY_HLT_InclusiveHT " << std::endl; } -void SUSY_HLT_InclusiveHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &) { - edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::beginRun" << std::endl; -} - void SUSY_HLT_InclusiveHT::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) { edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::bookHistograms" << std::endl; // book at beginRun @@ -169,10 +165,6 @@ void SUSY_HLT_InclusiveHT::analyze(edm::Event const &e, edm::EventSetup const &e } } -void SUSY_HLT_InclusiveHT::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::endRun" << std::endl; -} - void SUSY_HLT_InclusiveHT::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc index 5aaadc61e0cc1..9f41f68f8944e 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc @@ -274,10 +274,6 @@ void SUSY_HLT_MuEle_Hadronic::analyze(edm::Event const &e, edm::EventSetup const } } -void SUSY_HLT_MuEle_Hadronic::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::endRun" << std::endl; -} - void SUSY_HLT_MuEle_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc index 6e289973ebabe..2a99a4c0f4874 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc @@ -99,10 +99,6 @@ void SUSY_HLT_MuonFakes::analyze(edm::Event const &e, edm::EventSetup const &eSe // } } -void SUSY_HLT_MuonFakes::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::endRun" << std::endl; -} - void SUSY_HLT_MuonFakes::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc index 6264ccdc12bc8..742b0f9704fba 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc @@ -111,10 +111,6 @@ void SUSY_HLT_Muon_BJet::analyze(edm::Event const &e, edm::EventSetup const &eSe } } -void SUSY_HLT_Muon_BJet::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::endRun" << std::endl; -} - void SUSY_HLT_Muon_BJet::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc index 7a1fb931f47ad..caf9bb7c8e34d 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc @@ -258,10 +258,6 @@ void SUSY_HLT_Muon_Hadronic::analyze(edm::Event const &e, edm::EventSetup const } } -void SUSY_HLT_Muon_Hadronic::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::endRun" << std::endl; -} - void SUSY_HLT_Muon_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc index fae8e14f0c45b..354265de8c96d 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc @@ -24,10 +24,6 @@ SUSY_HLT_PhotonHT::~SUSY_HLT_PhotonHT() { edm::LogInfo("SUSY_HLT_PhotonHT") << "Destructor SUSY_HLT_PhotonHT::~SUSY_HLT_PhotonHT " << std::endl; } -void SUSY_HLT_PhotonHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &) { - edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::beginRun" << std::endl; -} - void SUSY_HLT_PhotonHT::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) { edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::bookHistograms" << std::endl; // book at beginRun @@ -131,10 +127,6 @@ void SUSY_HLT_PhotonHT::analyze(edm::Event const &e, edm::EventSetup const &eSet } } -void SUSY_HLT_PhotonHT::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::endRun" << std::endl; -} - void SUSY_HLT_PhotonHT::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc index a756b520eddec..63e6957c9690f 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc @@ -21,10 +21,6 @@ SUSY_HLT_PhotonMET::~SUSY_HLT_PhotonMET() { edm::LogInfo("SUSY_HLT_PhotonMET") << "Destructor SUSY_HLT_PhotonMET::~SUSY_HLT_PhotonMET " << std::endl; } -void SUSY_HLT_PhotonMET::dqmBeginRun(edm::Run const &, edm::EventSetup const &) { - edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::beginRun" << std::endl; -} - void SUSY_HLT_PhotonMET::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) { edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::bookHistograms" << std::endl; // book at beginRun @@ -103,10 +99,6 @@ void SUSY_HLT_PhotonMET::analyze(edm::Event const &e, edm::EventSetup const &eSe } } -void SUSY_HLT_PhotonMET::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::endRun" << std::endl; -} - void SUSY_HLT_PhotonMET::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc index ad41a2ada77b0..7cd9b40866924 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc @@ -22,10 +22,6 @@ SUSY_HLT_Razor::~SUSY_HLT_Razor() { edm::LogInfo("SUSY_HLT_Razor") << "Destructor SUSY_HLT_Razor::~SUSY_HLT_Razor " << std::endl; } -void SUSY_HLT_Razor::dqmBeginRun(edm::Run const &, edm::EventSetup const &) { - edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::beginRun" << std::endl; -} - void SUSY_HLT_Razor::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) { edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::bookHistograms" << std::endl; // book at beginRun @@ -218,10 +214,6 @@ void SUSY_HLT_Razor::analyze(edm::Event const &e, edm::EventSetup const &eSetup) } } -void SUSY_HLT_Razor::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::endRun" << std::endl; -} - void SUSY_HLT_Razor::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc index ac031b38ab756..f2a9fed9e0b17 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc @@ -741,9 +741,5 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & } } -void SUSY_HLT_SingleLepton::dqmEndRun(const edm::Run &run, const edm::EventSetup &eSetup) { - edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::endRun\n"; -} - // define this as a plug-in DEFINE_FWK_MODULE(SUSY_HLT_SingleLepton); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc index 6841f809b2dca..452b3652bd179 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc @@ -355,10 +355,6 @@ void SUSY_HLT_VBF_Mu::analyze(edm::Event const &e, edm::EventSetup const &eSetup } } -void SUSY_HLT_VBF_Mu::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::endRun" << std::endl; -} - void SUSY_HLT_VBF_Mu::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/SUSY_HLT_VBF_Mu"); diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc index 4dc0dfec6cd9f..4e04d15115a63 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc @@ -235,10 +235,6 @@ void SUSY_HLT_alphaT::analyze(edm::Event const &e, edm::EventSetup const &eSetup } } -void SUSY_HLT_alphaT::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) { - edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::endRun" << std::endl; -} - void SUSY_HLT_alphaT::bookHistos(DQMStore::IBooker &ibooker_) { ibooker_.cd(); ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_); diff --git a/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc b/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc index 0841a97b16836..630a82271a8eb 100644 --- a/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc +++ b/PhysicsTools/NanoAOD/plugins/NanoAODDQM.cc @@ -43,7 +43,6 @@ class NanoAODDQM : public DQMEDAnalyzer { protected: //Book histograms void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override {} private: class Plot { diff --git a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc index 874b7b897a434..6e93b149d6496 100644 --- a/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc +++ b/SimTracker/SiPhase2Digitizer/test/TBeamTest.cc @@ -52,7 +52,6 @@ class TBeamTest : public DQMEDAnalyzer { public: explicit TBeamTest(const edm::ParameterSet&); ~TBeamTest() override; - void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override; void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; @@ -108,12 +107,6 @@ TBeamTest::~TBeamTest() { edm::LogInfo("TBeamTest") << ">>> Destroy TBeamTest "; } // -// -- DQM Begin Run -// -void TBeamTest::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) { - edm::LogInfo("TBeamTest") << "Initialize TBeamTest "; -} -// // -- Analyze // void TBeamTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { diff --git a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h b/Validation/EcalDigis/interface/EcalMixingModuleValidation.h index 043ec9d2999c7..a4da896263116 100644 --- a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h +++ b/Validation/EcalDigis/interface/EcalMixingModuleValidation.h @@ -8,8 +8,8 @@ * */ +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -19,7 +19,6 @@ #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "DQMServices/Core/interface/DQMStore.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h" @@ -61,7 +60,6 @@ #include #include #include -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" namespace edm { class StreamID; @@ -71,7 +69,7 @@ namespace CLHEP { class HepRandomEngine; } -class EcalMixingModuleValidation : public DQMEDAnalyzer { +class EcalMixingModuleValidation : public DQMOneEDAnalyzer<> { typedef std::map > MapType; public: diff --git a/Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h b/Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h index 77fdeb08396da..5e3fceb76f3ea 100644 --- a/Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h +++ b/Validation/EcalDigis/interface/EcalSelectiveReadoutValidation.h @@ -7,7 +7,7 @@ * */ -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" @@ -31,7 +31,7 @@ class EEDetId; class EcalElectronicsMapping; class EcalTrigTowerConstituentsMap; -class EcalSelectiveReadoutValidation : public DQMEDAnalyzer { +class EcalSelectiveReadoutValidation : public DQMOneEDAnalyzer<> { typedef EcalRecHitCollection RecHitCollection; typedef EcalRecHit RecHit; diff --git a/Validation/EventGenerator/interface/BPhysicsSpectrum.h b/Validation/EventGenerator/interface/BPhysicsSpectrum.h index cbfc2bdc3f798..152816b0c0699 100644 --- a/Validation/EventGenerator/interface/BPhysicsSpectrum.h +++ b/Validation/EventGenerator/interface/BPhysicsSpectrum.h @@ -37,7 +37,6 @@ class BPhysicsSpectrum : public DQMEDAnalyzer { ~BPhysicsSpectrum() override; void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run &r, const edm::EventSetup &c) override; void analyze(edm::Event const &, edm::EventSetup const &) override; private: diff --git a/Validation/EventGenerator/interface/BPhysicsValidation.h b/Validation/EventGenerator/interface/BPhysicsValidation.h index b65368cf69b7a..4a6d3f7ae07fa 100644 --- a/Validation/EventGenerator/interface/BPhysicsValidation.h +++ b/Validation/EventGenerator/interface/BPhysicsValidation.h @@ -37,7 +37,6 @@ class BPhysicsValidation : public DQMEDAnalyzer { ~BPhysicsValidation() override; void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override; - void dqmBeginRun(const edm::Run &r, const edm::EventSetup &c) override; void analyze(edm::Event const &, edm::EventSetup const &) override; private: diff --git a/Validation/EventGenerator/plugins/BPhysicsSpectrum.cc b/Validation/EventGenerator/plugins/BPhysicsSpectrum.cc index 6c4223155a3db..92a7fc90c15cf 100644 --- a/Validation/EventGenerator/plugins/BPhysicsSpectrum.cc +++ b/Validation/EventGenerator/plugins/BPhysicsSpectrum.cc @@ -22,8 +22,6 @@ BPhysicsSpectrum::BPhysicsSpectrum(const edm::ParameterSet& iPSet) BPhysicsSpectrum::~BPhysicsSpectrum() {} -void BPhysicsSpectrum::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void BPhysicsSpectrum::bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) { DQMHelper dqm(&i); i.setCurrentFolder("Generator/BPhysics"); diff --git a/Validation/EventGenerator/plugins/BPhysicsValidation.cc b/Validation/EventGenerator/plugins/BPhysicsValidation.cc index c7ed018fa2119..672c116fadf65 100644 --- a/Validation/EventGenerator/plugins/BPhysicsValidation.cc +++ b/Validation/EventGenerator/plugins/BPhysicsValidation.cc @@ -25,8 +25,6 @@ BPhysicsValidation::BPhysicsValidation(const edm::ParameterSet& iPSet) BPhysicsValidation::~BPhysicsValidation() {} -void BPhysicsValidation::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} - void BPhysicsValidation::bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) { DQMHelper dqm(&i); i.setCurrentFolder("Generator/BPhysics"); diff --git a/Validation/HcalDigis/interface/ZDCDigiStudy.h b/Validation/HcalDigis/interface/ZDCDigiStudy.h index 4180d5228aad2..706c59ea84266 100644 --- a/Validation/HcalDigis/interface/ZDCDigiStudy.h +++ b/Validation/HcalDigis/interface/ZDCDigiStudy.h @@ -21,7 +21,7 @@ #define SimG4CMS_ZDCDigiStudy_H #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/ESHandle.h" @@ -42,7 +42,7 @@ #include #include -class ZDCDigiStudy : public DQMEDAnalyzer { +class ZDCDigiStudy : public DQMOneEDAnalyzer<> { public: ZDCDigiStudy(const edm::ParameterSet& ps); ~ZDCDigiStudy() override; diff --git a/Validation/HcalHits/interface/ZdcSimHitStudy.h b/Validation/HcalHits/interface/ZdcSimHitStudy.h index 294cf23461e69..e53eca0859a6e 100644 --- a/Validation/HcalHits/interface/ZdcSimHitStudy.h +++ b/Validation/HcalHits/interface/ZdcSimHitStudy.h @@ -61,7 +61,6 @@ class ZdcSimHitStudy : public DQMEDAnalyzer { ~ZdcSimHitStudy() override; protected: - void dqmEndRun(const edm::Run &run, const edm::EventSetup &c) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(const edm::Event &e, const edm::EventSetup &c) override; diff --git a/Validation/HcalHits/src/ZdcSimHitStudy.cc b/Validation/HcalHits/src/ZdcSimHitStudy.cc index 8815dce42830a..ef77ccf641de0 100644 --- a/Validation/HcalHits/src/ZdcSimHitStudy.cc +++ b/Validation/HcalHits/src/ZdcSimHitStudy.cc @@ -866,5 +866,3 @@ int ZdcSimHitStudy::FillHitValHist(int side, int section, int channel, double en } return 0; } - -void ZdcSimHitStudy::dqmEndRun(const edm::Run &run, const edm::EventSetup &c) {} diff --git a/Validation/RecoEgamma/plugins/PhotonValidator.h b/Validation/RecoEgamma/plugins/PhotonValidator.h index a6e0774703990..5d8e888c7257c 100644 --- a/Validation/RecoEgamma/plugins/PhotonValidator.h +++ b/Validation/RecoEgamma/plugins/PhotonValidator.h @@ -29,7 +29,7 @@ //DQM services #include "DQMServices/Core/interface/DQMStore.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" // #include @@ -55,7 +55,7 @@ class TTree; class SimVertex; class SimTrack; -class PhotonValidator : public DQMEDAnalyzer { +class PhotonValidator : public DQMOneEDAnalyzer<> { public: // explicit PhotonValidator(const edm::ParameterSet&); diff --git a/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.cc b/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.cc index bc8629d7ad78e..dd5dd56501749 100644 --- a/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.cc +++ b/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.cc @@ -193,8 +193,6 @@ void PhotonValidatorMiniAOD::bookHistograms(DQMStore::IBooker &iBooker, h_phoIso_[2] = iBooker.book1D(histname + "Endcap_miniAOD", "PF photonIso: Endcap", etBin, etMin, 20.); } -void PhotonValidatorMiniAOD::dqmEndRun(edm::Run const &r, edm::EventSetup const &theEventSetup) {} - void PhotonValidatorMiniAOD::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { // ******************************************************************************** using namespace edm; @@ -366,5 +364,3 @@ void PhotonValidatorMiniAOD::analyze(const edm::Event &iEvent, const edm::EventS } // end loop over gen photons } - -void PhotonValidatorMiniAOD::dqmBeginRun(edm::Run const &r, edm::EventSetup const &theEventSetup) {} diff --git a/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.h b/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.h index d238c92d484b5..b9d8ba7be2ba3 100644 --- a/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.h +++ b/Validation/RecoEgamma/plugins/PhotonValidatorMiniAOD.h @@ -51,8 +51,6 @@ class PhotonValidatorMiniAOD : public DQMEDAnalyzer { void analyze(const edm::Event&, const edm::EventSetup&) override; // virtual void beginJob(); - void dqmBeginRun(edm::Run const& r, edm::EventSetup const& theEventSetup) override; - void dqmEndRun(edm::Run const& r, edm::EventSetup const& es) override; void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; private: diff --git a/Validation/RecoEgamma/plugins/TkConvValidator.h b/Validation/RecoEgamma/plugins/TkConvValidator.h index 5d0f30bb934f9..495ee3001bd0e 100644 --- a/Validation/RecoEgamma/plugins/TkConvValidator.h +++ b/Validation/RecoEgamma/plugins/TkConvValidator.h @@ -24,7 +24,7 @@ //DQM services #include "DQMServices/Core/interface/DQMStore.h" #include "FWCore/ServiceRegistry/interface/Service.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" // #include @@ -46,7 +46,7 @@ class SimTrack; ** ***/ -class TkConvValidator : public DQMEDAnalyzer { +class TkConvValidator : public DQMOneEDAnalyzer<> { public: // explicit TkConvValidator(const edm::ParameterSet&); diff --git a/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h b/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h index 4974ed34a9199..71c9d93e1b18e 100644 --- a/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h +++ b/Validation/RecoMuon/src/GlobalMuonMatchAnalyzer.h @@ -17,18 +17,12 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "DataFormats/Common/interface/View.h" -#include "DataFormats/TrackReco/interface/Track.h" +# #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h" #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "DQMServices/Core/interface/DQMStore.h" namespace reco { @@ -42,7 +36,7 @@ class TrackAssociatorBase; // class decleration // -class GlobalMuonMatchAnalyzer : public DQMEDAnalyzer { +class GlobalMuonMatchAnalyzer : public DQMOneEDAnalyzer<> { public: explicit GlobalMuonMatchAnalyzer(const edm::ParameterSet &); ~GlobalMuonMatchAnalyzer() override; diff --git a/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h b/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h index 84b0ae491af49..35e43804e8910 100644 --- a/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h +++ b/Validation/RecoMuon/src/MuonTrackResidualAnalyzer.h @@ -8,14 +8,11 @@ */ // Base Class Headers -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Framework/interface/ESHandle.h" #include "DataFormats/Common/interface/Handle.h" -#include "DQMServices/Core/interface/DQMStore.h" -#include "FWCore/ServiceRegistry/interface/Service.h" - #include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h" #include "SimDataFormats/Track/interface/SimTrackContainer.h" #include "SimDataFormats/TrackingHit/interface/PSimHit.h" @@ -26,7 +23,6 @@ #include "DataFormats/DetId/interface/DetId.h" #include "TrackingTools/PatternTools/interface/Trajectory.h" -#include namespace edm { class ParameterSet; @@ -41,7 +37,7 @@ class KFUpdator; class MeasurementEstimator; class HResolution1DRecHit; -class MuonTrackResidualAnalyzer : public DQMEDAnalyzer { +class MuonTrackResidualAnalyzer : public DQMOneEDAnalyzer<> { public: enum EtaRange { all, barrel, endcap }; diff --git a/Validation/RecoMuon/src/RecoMuonValidator.h b/Validation/RecoMuon/src/RecoMuonValidator.h index 9620095cfe558..c56a71e9749b6 100644 --- a/Validation/RecoMuon/src/RecoMuonValidator.h +++ b/Validation/RecoMuon/src/RecoMuonValidator.h @@ -1,8 +1,8 @@ #ifndef Validation_RecoMuon_RecoMuonValidator_H #define Validation_RecoMuon_RecoMuonValidator_H +#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" @@ -20,16 +20,14 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h" #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h" -#include "DQMServices/Core/interface/DQMEDAnalyzer.h" // for selection cut #include "CommonTools/Utils/interface/StringCutObjectSelector.h" -#include "DQMServices/Core/interface/DQMStore.h" class MuonServiceProxy; class TrackAssociatorBase; -class RecoMuonValidator : public DQMEDAnalyzer { +class RecoMuonValidator : public DQMOneEDAnalyzer<> { public: RecoMuonValidator(const edm::ParameterSet& pset); ~RecoMuonValidator() override; diff --git a/Validation/RecoParticleFlow/plugins/OffsetAnalyzerDQM.cc b/Validation/RecoParticleFlow/plugins/OffsetAnalyzerDQM.cc index 6386c268d92ed..9689f7ad2b8fb 100644 --- a/Validation/RecoParticleFlow/plugins/OffsetAnalyzerDQM.cc +++ b/Validation/RecoParticleFlow/plugins/OffsetAnalyzerDQM.cc @@ -21,8 +21,6 @@ class OffsetAnalyzerDQM : public DQMEDAnalyzer { protected: //Book histograms void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override; - void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override {} - void dqmEndRun(const edm::Run&, const edm::EventSetup&) override {} int getEtaIndex(float eta); private: diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc index 54da179a7494e..351f654dc4ff8 100644 --- a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc +++ b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc @@ -87,10 +87,6 @@ Phase2TrackerValidateDigi::~Phase2TrackerValidateDigi() { // // -- DQM Begin Run // -void Phase2TrackerValidateDigi::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) { - edm::LogInfo("Phase2TrackerValidateDigi") << "Initialize Phase2TrackerValidateDigi "; -} -// // -- Analyze // void Phase2TrackerValidateDigi::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.h b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.h index 084550dbe70ff..7844f1d75e4be 100644 --- a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.h +++ b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.h @@ -30,7 +30,6 @@ class Phase2TrackerValidateDigi : public DQMEDAnalyzer { explicit Phase2TrackerValidateDigi(const edm::ParameterSet&); ~Phase2TrackerValidateDigi() override; void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) override; - void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override; void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; struct DigiMEs {