diff --git a/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.cc b/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.cc index f3ac9436bcce1..b3ed8e46e4bb4 100644 --- a/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.cc +++ b/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.cc @@ -28,7 +28,7 @@ AlcaBeamMonitorClient::AlcaBeamMonitorClient(const ParameterSet& ps) numberOfValuesToSave_(0) { dbe_ = Service().operator->(); - if (monitorName_ != "") monitorName_ = monitorName_ + "/"; + if (!monitorName_.empty()) monitorName_ = monitorName_ + "/"; varNamesV_.push_back("x"); varNamesV_.push_back("y"); @@ -106,8 +106,6 @@ void AlcaBeamMonitorClient::beginRun(const edm::Run& r, } //---------------------------------------------------------------------------------------------------------------------- -void AlcaBeamMonitorClient::beginLuminosityBlock(const LuminosityBlock& iLumi, - const EventSetup& iSetup) {} //---------------------------------------------------------------------------------------------------------------------- void AlcaBeamMonitorClient::analyze(const Event& iEvent, diff --git a/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h b/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h index 90baf82970ef9..2bfb05d6e49c8 100644 --- a/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h +++ b/DQM/BeamMonitor/plugins/AlcaBeamMonitorClient.h @@ -31,7 +31,6 @@ class AlcaBeamMonitorClient : public edm::EDAnalyzer { void beginJob (void) override; void beginRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override; void analyze (const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - void beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override; void endLuminosityBlock (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup) override; void endRun (const edm::Run& iRun, const edm::EventSetup& iSetup) override; void endJob (const edm::LuminosityBlock& iLumi, const edm::EventSetup& iSetup); diff --git a/DQM/CastorMonitor/interface/CastorMonitorModule.h b/DQM/CastorMonitor/interface/CastorMonitorModule.h index 1df548d537d16..bf67c571eb703 100644 --- a/DQM/CastorMonitor/interface/CastorMonitorModule.h +++ b/DQM/CastorMonitor/interface/CastorMonitorModule.h @@ -83,11 +83,7 @@ class CastorMonitorModule : public DQMEDAnalyzer{ void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& eventSetup) override ; - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& eventSetup) override; void endRun(const edm::Run& run, const edm::EventSetup& eventSetup) override; diff --git a/DQM/CastorMonitor/src/CastorMonitorModule.cc b/DQM/CastorMonitor/src/CastorMonitorModule.cc index fa417048e39c5..7a0bcbafabcca 100644 --- a/DQM/CastorMonitor/src/CastorMonitorModule.cc +++ b/DQM/CastorMonitor/src/CastorMonitorModule.cc @@ -109,11 +109,7 @@ void CastorMonitorModule::bookHistograms(DQMStore::IBooker& ibooker, return; } -void CastorMonitorModule::beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) { } -void CastorMonitorModule::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) {} void CastorMonitorModule::endRun(const edm::Run& r, const edm::EventSetup& context) {} diff --git a/DQM/DTMonitorModule/interface/DTDigiTask.h b/DQM/DTMonitorModule/interface/DTDigiTask.h index 6832be82c32ac..51f21583f2fae 100644 --- a/DQM/DTMonitorModule/interface/DTDigiTask.h +++ b/DQM/DTMonitorModule/interface/DTDigiTask.h @@ -74,7 +74,6 @@ class DTDigiTask: public DQMEDAnalyzer{ /// To reset the MEs void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) override; - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) override; /// To map real channels void channelsMap(const DTChamberId& dtCh, std::string histoTag); diff --git a/DQM/DTMonitorModule/src/DTDigiTask.cc b/DQM/DTMonitorModule/src/DTDigiTask.cc index bc94b2a879594..0765b34918f73 100644 --- a/DQM/DTMonitorModule/src/DTDigiTask.cc +++ b/DQM/DTMonitorModule/src/DTDigiTask.cc @@ -739,9 +739,6 @@ string DTDigiTask::topFolder() const { -void DTDigiTask::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& setup) { - -} void DTDigiTask::channelsMap(const DTChamberId &dtCh, string histoTag) { diff --git a/DQM/DTMonitorModule/src/DTNoiseTask.cc b/DQM/DTMonitorModule/src/DTNoiseTask.cc index 7ff5239b8d095..a04ed8acec2eb 100644 --- a/DQM/DTMonitorModule/src/DTNoiseTask.cc +++ b/DQM/DTMonitorModule/src/DTNoiseTask.cc @@ -66,16 +66,6 @@ DTNoiseTask::DTNoiseTask(const ParameterSet& ps) : evtNumber(0) { DTNoiseTask::~DTNoiseTask(){} -/// To reset the MEs -void DTNoiseTask::beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) { - - LogVerbatim("DTNoiseTask") <<"[DTNoiseTask]: Begin of LS transition"< 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 b910ee3637891..fe397c9b45e95 100644 --- a/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h +++ b/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h @@ -30,7 +30,6 @@ class L1TMP7ZeroSupp : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) 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/L1TObjectsTiming.h b/DQM/L1TMonitor/interface/L1TObjectsTiming.h index f6eb09606d6a6..0eaaadf09340b 100644 --- a/DQM/L1TMonitor/interface/L1TObjectsTiming.h +++ b/DQM/L1TMonitor/interface/L1TObjectsTiming.h @@ -41,7 +41,6 @@ class L1TObjectsTiming : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TPUM.h b/DQM/L1TMonitor/interface/L1TPUM.h index c98d002e3a08a..50d048c46400f 100644 --- a/DQM/L1TMonitor/interface/L1TPUM.h +++ b/DQM/L1TMonitor/interface/L1TPUM.h @@ -31,7 +31,6 @@ class L1TPUM : public DQMEDAnalyzer { 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; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: edm::EDGetTokenT regionSource_; diff --git a/DQM/L1TMonitor/interface/L1TRPCTF.h b/DQM/L1TMonitor/interface/L1TRPCTF.h index 534488dcb8f18..5cde01165fdbc 100755 --- a/DQM/L1TMonitor/interface/L1TRPCTF.h +++ b/DQM/L1TMonitor/interface/L1TRPCTF.h @@ -59,7 +59,6 @@ class L1TRPCTF : public DQMEDAnalyzer { void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c) override; - void endLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c) override; private: diff --git a/DQM/L1TMonitor/interface/L1TRPCTPG.h b/DQM/L1TMonitor/interface/L1TRPCTPG.h index c81d8c99722e9..cd2aca815277f 100755 --- a/DQM/L1TMonitor/interface/L1TRPCTPG.h +++ b/DQM/L1TMonitor/interface/L1TRPCTPG.h @@ -72,7 +72,6 @@ class L1TRPCTPG : public DQMEDAnalyzer { // BeginRun void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; private: // ----------member data --------------------------- diff --git a/DQM/L1TMonitor/interface/L1TStage2BMTF.h b/DQM/L1TMonitor/interface/L1TStage2BMTF.h index eb7fdf87dd1e1..37d8cb3e00c31 100644 --- a/DQM/L1TMonitor/interface/L1TStage2BMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2BMTF.h @@ -63,7 +63,6 @@ L1TStage2BMTF(const edm::ParameterSet & ps); // member functions protected: void analyze(const edm::Event&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override ; diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h index eab9e11db298b..088ef503330d9 100644 --- a/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h +++ b/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h @@ -30,7 +30,6 @@ class L1TStage2CaloLayer2 : public DQMEDAnalyzer { void analyze(const edm::Event& e, const edm::EventSetup& c) override; void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override ; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h index 4703950b7f58a..ec4140ef42386 100644 --- a/DQM/L1TMonitor/interface/L1TStage2EMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2EMTF.h @@ -24,7 +24,6 @@ class L1TStage2EMTF : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2MuonComp.h b/DQM/L1TMonitor/interface/L1TStage2MuonComp.h index 000b7311ee980..9a833409e76a3 100644 --- a/DQM/L1TMonitor/interface/L1TStage2MuonComp.h +++ b/DQM/L1TMonitor/interface/L1TStage2MuonComp.h @@ -25,7 +25,6 @@ class L1TStage2MuonComp : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2OMTF.h b/DQM/L1TMonitor/interface/L1TStage2OMTF.h index 7f1e1f51fa65e..46567594398f6 100644 --- a/DQM/L1TMonitor/interface/L1TStage2OMTF.h +++ b/DQM/L1TMonitor/interface/L1TStage2OMTF.h @@ -44,7 +44,6 @@ L1TStage2OMTF(const edm::ParameterSet & ps); // member functions protected: void analyze(const edm::Event&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override ; diff --git a/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h b/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h index 65a5fe476a8fa..365c03e47a6d1 100644 --- a/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h +++ b/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h @@ -25,7 +25,6 @@ class L1TStage2RegionalMuonCandComp : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2uGMT.h b/DQM/L1TMonitor/interface/L1TStage2uGMT.h index 15ce142b529f9..01e1362a2614a 100644 --- a/DQM/L1TMonitor/interface/L1TStage2uGMT.h +++ b/DQM/L1TMonitor/interface/L1TStage2uGMT.h @@ -27,7 +27,6 @@ class L1TStage2uGMT : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2uGMTMuon.h b/DQM/L1TMonitor/interface/L1TStage2uGMTMuon.h index 762f394ed04c3..3e8d7e53302ff 100644 --- a/DQM/L1TMonitor/interface/L1TStage2uGMTMuon.h +++ b/DQM/L1TMonitor/interface/L1TStage2uGMTMuon.h @@ -24,7 +24,6 @@ class L1TStage2uGMTMuon : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TStage2uGT.h b/DQM/L1TMonitor/interface/L1TStage2uGT.h index 133f2cb2b22cb..2aed591f27ddc 100644 --- a/DQM/L1TMonitor/interface/L1TStage2uGT.h +++ b/DQM/L1TMonitor/interface/L1TStage2uGT.h @@ -49,10 +49,8 @@ class L1TStage2uGT: public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; // end section private: diff --git a/DQM/L1TMonitor/interface/L1TdeCSCTF.h b/DQM/L1TMonitor/interface/L1TdeCSCTF.h index fee7c0dc93864..d31058eebcaac 100644 --- a/DQM/L1TMonitor/interface/L1TdeCSCTF.h +++ b/DQM/L1TMonitor/interface/L1TdeCSCTF.h @@ -69,7 +69,6 @@ class L1TdeCSCTF : public DQMEDAnalyzer { void analyze(edm::Event const& e, edm::EventSetup const& iSetup) override; void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override; void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; public: explicit L1TdeCSCTF(edm::ParameterSet const& pset); diff --git a/DQM/L1TMonitor/interface/L1TdeGCT.h b/DQM/L1TMonitor/interface/L1TdeGCT.h index 6cfdf514db9cd..90754a174757c 100644 --- a/DQM/L1TMonitor/interface/L1TdeGCT.h +++ b/DQM/L1TMonitor/interface/L1TdeGCT.h @@ -36,7 +36,6 @@ class L1TdeGCT : public DQMEDAnalyzer { void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) override ; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h b/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h index 42f27c53a0c07..3d33f2e83ac77 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h +++ b/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h @@ -21,7 +21,6 @@ class L1TdeStage2EMTF : public DQMEDAnalyzer { protected: void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/DQM/L1TMonitor/interface/L1TdeStage2uGT.h b/DQM/L1TMonitor/interface/L1TdeStage2uGT.h index 11f2b9e34094b..6fba5b8c07c4d 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2uGT.h +++ b/DQM/L1TMonitor/interface/L1TdeStage2uGT.h @@ -45,8 +45,6 @@ class L1TdeStage2uGT : public DQMEDAnalyzer { 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; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; - void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: // Input and config info diff --git a/DQM/L1TMonitor/src/L1ExtraDQM.cc b/DQM/L1TMonitor/src/L1ExtraDQM.cc index f6312d77db47f..99ab6581db80c 100644 --- a/DQM/L1TMonitor/src/L1ExtraDQM.cc +++ b/DQM/L1TMonitor/src/L1ExtraDQM.cc @@ -389,9 +389,6 @@ void L1ExtraDQM::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& evSetu } -void L1ExtraDQM::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup& evSetup){ - -} void L1ExtraDQM::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const& evSetup) { diff --git a/DQM/L1TMonitor/src/L1GtHwValidation.cc b/DQM/L1TMonitor/src/L1GtHwValidation.cc index 93f55fd3437f6..d70d916a83227 100644 --- a/DQM/L1TMonitor/src/L1GtHwValidation.cc +++ b/DQM/L1TMonitor/src/L1GtHwValidation.cc @@ -161,9 +161,6 @@ L1GtHwValidation::~L1GtHwValidation() { void L1GtHwValidation::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& evSetup){ } -void L1GtHwValidation::beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& evSetup){ - -} void L1GtHwValidation::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& iRun, const edm::EventSetup& evSetup) { diff --git a/DQM/L1TMonitor/src/L1TCSCTPG.cc b/DQM/L1TMonitor/src/L1TCSCTPG.cc old mode 100755 new mode 100644 index f05109e6c0466..646c52d491591 --- a/DQM/L1TMonitor/src/L1TCSCTPG.cc +++ b/DQM/L1TMonitor/src/L1TCSCTPG.cc @@ -58,8 +58,6 @@ void L1TCSCTPG::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const& iRun, void L1TCSCTPG::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c){ } -void L1TCSCTPG::beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c){ -} void L1TCSCTPG::analyze(const Event& e, const EventSetup& c) { diff --git a/DQM/L1TMonitor/src/L1TDEMON.cc b/DQM/L1TMonitor/src/L1TDEMON.cc index df041b6100e24..08bf41aa9065a 100644 --- a/DQM/L1TMonitor/src/L1TDEMON.cc +++ b/DQM/L1TMonitor/src/L1TDEMON.cc @@ -285,8 +285,6 @@ void L1TDEMON::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm:: void L1TDEMON::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c){ } -void L1TDEMON::beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c){ -} diff --git a/DQM/L1TMonitor/src/L1TDTTF.cc b/DQM/L1TMonitor/src/L1TDTTF.cc old mode 100755 new mode 100644 index 02c412c1f9992..ab3e1091f9dcd --- a/DQM/L1TMonitor/src/L1TDTTF.cc +++ b/DQM/L1TMonitor/src/L1TDTTF.cc @@ -246,9 +246,6 @@ void L1TDTTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c){ //empty } -void L1TDTTF::beginLuminosityBlock(const edm::LuminosityBlock &l, const edm::EventSetup &c){ - //empty -} //-------------------------------------------------------- void L1TDTTF::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run&, const edm::EventSetup&) diff --git a/DQM/L1TMonitor/src/L1TDTTPG.cc b/DQM/L1TMonitor/src/L1TDTTPG.cc old mode 100755 new mode 100644 index 830100be2204e..84b5c94fa4ab1 --- a/DQM/L1TMonitor/src/L1TDTTPG.cc +++ b/DQM/L1TMonitor/src/L1TDTTPG.cc @@ -124,10 +124,6 @@ void L1TDTTPG::dqmBeginRun(const edm::Run &r, const edm::EventSetup &c){ } -void L1TDTTPG::beginLuminosityBlock(const edm::LuminosityBlock &l, const edm::EventSetup &c){ - //empty - -} void L1TDTTPG::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) { diff --git a/DQM/L1TMonitor/src/L1TGCT.cc b/DQM/L1TMonitor/src/L1TGCT.cc old mode 100755 new mode 100644 index 5d533a6524167..7e6e625b7d74d --- a/DQM/L1TMonitor/src/L1TGCT.cc +++ b/DQM/L1TMonitor/src/L1TGCT.cc @@ -220,9 +220,6 @@ void L1TGCT::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) } -void L1TGCT::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evSetup) { - -} void L1TGCT::analyze(const edm::Event & e, const edm::EventSetup & c) { diff --git a/DQM/L1TMonitor/src/L1TGMT.cc b/DQM/L1TMonitor/src/L1TGMT.cc old mode 100755 new mode 100644 index d7bf7c5b95e3c..019840804c12d --- a/DQM/L1TMonitor/src/L1TGMT.cc +++ b/DQM/L1TMonitor/src/L1TGMT.cc @@ -39,10 +39,6 @@ void L1TGMT::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) { } -void L1TGMT::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) -{ - //empty -} void L1TGMT::analyze(const Event& e, const EventSetup& c) diff --git a/DQM/L1TMonitor/src/L1TGT.cc b/DQM/L1TMonitor/src/L1TGT.cc old mode 100755 new mode 100644 index 1491e94267096..c325360363c3b --- a/DQM/L1TMonitor/src/L1TGT.cc +++ b/DQM/L1TMonitor/src/L1TGT.cc @@ -311,10 +311,6 @@ void L1TGT::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) { } -void L1TGT::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evSetup) { - - -} // void L1TGT::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup) { diff --git a/DQM/L1TMonitor/src/L1THIonImp.cc b/DQM/L1TMonitor/src/L1THIonImp.cc index 29996f63d7be2..9c4df0a6df9ec 100644 --- a/DQM/L1TMonitor/src/L1THIonImp.cc +++ b/DQM/L1TMonitor/src/L1THIonImp.cc @@ -179,8 +179,6 @@ void L1THIonImp::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm void L1THIonImp::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) { } -void L1THIonImp::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evSetup) { -} void L1THIonImp::analyze(const edm::Event & e, const edm::EventSetup & c) { diff --git a/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc b/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc index 12d70e76bc329..53597834c4cbe 100644 --- a/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc +++ b/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc @@ -71,7 +71,6 @@ void L1TMP7ZeroSupp::fillDescriptions(edm::ConfigurationDescriptions& descriptio void L1TMP7ZeroSupp::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TMP7ZeroSupp::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TMP7ZeroSupp::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { // overall summary diff --git a/DQM/L1TMonitor/src/L1TObjectsTiming.cc b/DQM/L1TMonitor/src/L1TObjectsTiming.cc index c5ab8b5c60a77..3ebf6ccccaa6d 100644 --- a/DQM/L1TMonitor/src/L1TObjectsTiming.cc +++ b/DQM/L1TMonitor/src/L1TObjectsTiming.cc @@ -83,7 +83,6 @@ void L1TObjectsTiming::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) } } -void L1TObjectsTiming::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TObjectsTiming::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TPUM.cc b/DQM/L1TMonitor/src/L1TPUM.cc index b140ad883ec38..63046355dc50d 100644 --- a/DQM/L1TMonitor/src/L1TPUM.cc +++ b/DQM/L1TMonitor/src/L1TPUM.cc @@ -137,7 +137,4 @@ void L1TPUM::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& run , co regionBxEtSum_ = ibooker.book2D("regionBxEtSum", "Et per region per bunch crossing;Region index (18*eta+phi);BX index;Counts*et", 396, -0.5, 395.5, 5, -2.5, 2.5); } -void L1TPUM::beginLuminosityBlock(const edm::LuminosityBlock& ls,const edm::EventSetup& es) -{ -} diff --git a/DQM/L1TMonitor/src/L1TRPCTF.cc b/DQM/L1TMonitor/src/L1TRPCTF.cc old mode 100755 new mode 100644 index a90e3e03048b5..39a0b967484b3 --- a/DQM/L1TMonitor/src/L1TRPCTF.cc +++ b/DQM/L1TMonitor/src/L1TRPCTF.cc @@ -358,10 +358,6 @@ void L1TRPCTF::beginLuminosityBlock(const edm::LuminosityBlock& l, } -void L1TRPCTF::endLuminosityBlock(const edm::LuminosityBlock& l, - const edm::EventSetup& c){ - -} void L1TRPCTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c){ diff --git a/DQM/L1TMonitor/src/L1TRPCTPG.cc b/DQM/L1TMonitor/src/L1TRPCTPG.cc old mode 100755 new mode 100644 index d02d9ecbe9041..fb192edea187e --- a/DQM/L1TMonitor/src/L1TRPCTPG.cc +++ b/DQM/L1TMonitor/src/L1TRPCTPG.cc @@ -41,9 +41,6 @@ void L1TRPCTPG::dqmBeginRun(edm::Run const& r, edm::EventSetup const& c){ // } -void L1TRPCTPG::beginLuminosityBlock(edm::LuminosityBlock const& l, edm::EventSetup const& c){ - // -} void L1TRPCTPG::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) diff --git a/DQM/L1TMonitor/src/L1TStage2BMTF.cc b/DQM/L1TMonitor/src/L1TStage2BMTF.cc index abf6799daa42e..842bddc0e8c0f 100644 --- a/DQM/L1TMonitor/src/L1TStage2BMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2BMTF.cc @@ -29,9 +29,6 @@ void L1TStage2BMTF::dqmBeginRun(const edm::Run& iRrun, const edm::EventSetup& ev { } -void L1TStage2BMTF::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& eveSetup) -{ -} void L1TStage2BMTF::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& iRun, const edm::EventSetup& eveSetup) { diff --git a/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc b/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc index 06c57fd76102c..53d6a6b47c293 100644 --- a/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc +++ b/DQM/L1TMonitor/src/L1TStage2CaloLayer2.cc @@ -302,4 +302,3 @@ void L1TStage2CaloLayer2::analyze(const edm::Event & e, const edm::EventSetup & void L1TStage2CaloLayer2::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) {} -void L1TStage2CaloLayer2::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evSetup) {} diff --git a/DQM/L1TMonitor/src/L1TStage2EMTF.cc b/DQM/L1TMonitor/src/L1TStage2EMTF.cc index 61a776517d75a..887fe7dafadce 100644 --- a/DQM/L1TMonitor/src/L1TStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2EMTF.cc @@ -17,7 +17,6 @@ L1TStage2EMTF::~L1TStage2EMTF() {} void L1TStage2EMTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TStage2EMTF::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TStage2MuonComp.cc b/DQM/L1TMonitor/src/L1TStage2MuonComp.cc index a93d1f44c694f..2c6e82c2255b7 100644 --- a/DQM/L1TMonitor/src/L1TStage2MuonComp.cc +++ b/DQM/L1TMonitor/src/L1TStage2MuonComp.cc @@ -40,7 +40,6 @@ void L1TStage2MuonComp::fillDescriptions(edm::ConfigurationDescriptions& descrip void L1TStage2MuonComp::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TStage2MuonComp::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TStage2MuonComp::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TStage2OMTF.cc b/DQM/L1TMonitor/src/L1TStage2OMTF.cc index 089b7e0161ac1..019c5c8729602 100644 --- a/DQM/L1TMonitor/src/L1TStage2OMTF.cc +++ b/DQM/L1TMonitor/src/L1TStage2OMTF.cc @@ -23,9 +23,6 @@ void L1TStage2OMTF::dqmBeginRun(const edm::Run& iRrun, const edm::EventSetup& ev { } -void L1TStage2OMTF::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& eveSetup) -{ -} void L1TStage2OMTF::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& iRun, const edm::EventSetup& eveSetup) { diff --git a/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc b/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc index 21573c680470d..b55553de099c9 100644 --- a/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc +++ b/DQM/L1TMonitor/src/L1TStage2RegionalMuonCandComp.cc @@ -42,7 +42,6 @@ void L1TStage2RegionalMuonCandComp::fillDescriptions(edm::ConfigurationDescripti void L1TStage2RegionalMuonCandComp::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TStage2RegionalMuonCandComp::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} 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 02dceaf94f2cb..3b6d0c6e459d0 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGMT.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGMT.cc @@ -32,7 +32,6 @@ void L1TStage2uGMT::fillDescriptions(edm::ConfigurationDescriptions& description void L1TStage2uGMT::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TStage2uGMT::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TStage2uGMT::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc b/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc index f40621a80d7f4..3adfec3117ac4 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGMTMuon.cc @@ -24,7 +24,6 @@ void L1TStage2uGMTMuon::fillDescriptions(edm::ConfigurationDescriptions& descrip void L1TStage2uGMTMuon::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TStage2uGMTMuon::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TStage2uGMTMuon::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TStage2uGT.cc b/DQM/L1TMonitor/src/L1TStage2uGT.cc index 354848f1ae275..62f9fbe3578b2 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGT.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGT.cc @@ -31,9 +31,6 @@ void L1TStage2uGT::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& evtS numAlgs_ = static_cast(gtUtil_->decisionsInitial().size()); } -void L1TStage2uGT::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evtSetup) { - // empty -} void L1TStage2uGT::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const& evtSetup) { @@ -189,6 +186,3 @@ void L1TStage2uGT::analyze(const edm::Event& evt, const edm::EventSetup& evtSetu } // End section -void L1TStage2uGT::endLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evtSetup) { - // empty -} diff --git a/DQM/L1TMonitor/src/L1TdeCSCTF.cc b/DQM/L1TMonitor/src/L1TdeCSCTF.cc index a5588706fcbfd..47a8b00d4d922 100644 --- a/DQM/L1TMonitor/src/L1TdeCSCTF.cc +++ b/DQM/L1TMonitor/src/L1TdeCSCTF.cc @@ -91,8 +91,6 @@ L1TdeCSCTF::L1TdeCSCTF(ParameterSet const& pset) { void L1TdeCSCTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c){ } -void L1TdeCSCTF::beginLuminosityBlock(const edm::LuminosityBlock& l, const edm::EventSetup& c){ -} void L1TdeCSCTF::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&) { diff --git a/DQM/L1TMonitor/src/L1TdeGCT.cc b/DQM/L1TMonitor/src/L1TdeGCT.cc index 5b7eaa109f323..5ec3cce95abd3 100644 --- a/DQM/L1TMonitor/src/L1TdeGCT.cc +++ b/DQM/L1TMonitor/src/L1TdeGCT.cc @@ -41,8 +41,6 @@ L1TdeGCT::~L1TdeGCT() {} void L1TdeGCT::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& evSetup) {} -void L1TdeGCT::beginLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup& evSetup) -{} void L1TdeGCT::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&){ diff --git a/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc b/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc index 7d7edfb625500..8b39ae4501a50 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2EMTF.cc @@ -13,7 +13,6 @@ L1TdeStage2EMTF::~L1TdeStage2EMTF() {} void L1TdeStage2EMTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {} -void L1TdeStage2EMTF::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} void L1TdeStage2EMTF::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) { diff --git a/DQM/L1TMonitor/src/L1TdeStage2uGT.cc b/DQM/L1TMonitor/src/L1TdeStage2uGT.cc index aef5edfbeae92..7b4df4f05248a 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2uGT.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2uGT.cc @@ -174,9 +174,7 @@ void L1TdeStage2uGT::analyze(const edm::Event & event, const edm::EventSetup & e } -void L1TdeStage2uGT::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {} -void L1TdeStage2uGT::endLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup&) {} void L1TdeStage2uGT::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run& run , const edm::EventSetup& es) { diff --git a/DQM/Physics/src/HiggsDQM.cc b/DQM/Physics/src/HiggsDQM.cc index 841a130a374a6..e15cfe8c77435 100644 --- a/DQM/Physics/src/HiggsDQM.cc +++ b/DQM/Physics/src/HiggsDQM.cc @@ -171,17 +171,6 @@ HiggsDQM::~HiggsDQM() { // cout<<"...leaving HiggsDQM::~HiggsDQM. "< & meVector, std } -void RPCBxTest::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context){} void RPCBxTest::analyze(const edm::Event& iEvent, const edm::EventSetup& c) {} -void RPCBxTest::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& iSetup) { } void RPCBxTest::endJob(void) { edm::LogVerbatim ("rpcbxtest") << "[RPCBxTest]: end job "; diff --git a/DQM/TrackingMonitor/interface/LogMessageMonitor.h b/DQM/TrackingMonitor/interface/LogMessageMonitor.h index 01ad783c9fbb5..c92dc4fea962d 100644 --- a/DQM/TrackingMonitor/interface/LogMessageMonitor.h +++ b/DQM/TrackingMonitor/interface/LogMessageMonitor.h @@ -65,8 +65,6 @@ class LogMessageMonitor : public DQMEDAnalyzer { // virtual void beginRun(edm::Run const&, edm::EventSetup const&); void endRun(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; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; diff --git a/DQM/TrackingMonitor/interface/VertexMonitor.h b/DQM/TrackingMonitor/interface/VertexMonitor.h index 60c8b9bd5b000..c2bcb04c949dc 100644 --- a/DQM/TrackingMonitor/interface/VertexMonitor.h +++ b/DQM/TrackingMonitor/interface/VertexMonitor.h @@ -41,9 +41,6 @@ class VertexMonitor virtual void initHisto(DQMStore::IBooker & ibooker); virtual void analyze(const edm::Event&, const edm::EventSetup&); - virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); - virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&); - // ----------member data --------------------------- edm::ParameterSet conf_; diff --git a/DQM/TrackingMonitor/interface/dEdxAnalyzer.h b/DQM/TrackingMonitor/interface/dEdxAnalyzer.h index 382752d260a53..cc4e81d969e0e 100644 --- a/DQM/TrackingMonitor/interface/dEdxAnalyzer.h +++ b/DQM/TrackingMonitor/interface/dEdxAnalyzer.h @@ -43,10 +43,6 @@ class dEdxAnalyzer : public DQMEDAnalyzer { void endJob() override; double mass(double P, double I); - // virtual void beginRun(const edm::Run&, const edm::EventSetup&); - void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; - void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/TrackingMonitor/src/LogMessageMonitor.cc b/DQM/TrackingMonitor/src/LogMessageMonitor.cc index 0466048afd196..bcf4ee021ff92 100644 --- a/DQM/TrackingMonitor/src/LogMessageMonitor.cc +++ b/DQM/TrackingMonitor/src/LogMessageMonitor.cc @@ -296,18 +296,6 @@ LogMessageMonitor::endRun(edm::Run const&, edm::EventSetup const&) { } -// ------------ method called when starting to processes a luminosity block ------------ -void -LogMessageMonitor::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - -// ------------ method called when ending the processing of a luminosity block ------------ -void -LogMessageMonitor::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void LogMessageMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/DQM/TrackingMonitor/src/VertexMonitor.cc b/DQM/TrackingMonitor/src/VertexMonitor.cc index bb3b2bdad6ced..0a7597599208c 100644 --- a/DQM/TrackingMonitor/src/VertexMonitor.cc +++ b/DQM/TrackingMonitor/src/VertexMonitor.cc @@ -361,18 +361,6 @@ VertexMonitor::initHisto(DQMStore::IBooker & ibooker) } } - -void -VertexMonitor::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - -// ------------ method called when ending the processing of a luminosity block ------------ -void -VertexMonitor::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void VertexMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/DQM/TrackingMonitor/src/dEdxAnalyzer.cc b/DQM/TrackingMonitor/src/dEdxAnalyzer.cc index 8577f10744dc1..4b3b64656a79a 100644 --- a/DQM/TrackingMonitor/src/dEdxAnalyzer.cc +++ b/DQM/TrackingMonitor/src/dEdxAnalyzer.cc @@ -210,18 +210,6 @@ void dEdxAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet } - -void -dEdxAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - -// ------------ method called when ending the processing of a luminosity block ------------ -void -dEdxAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) -{ -} - // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ void dEdxAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h b/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h index 1108bda7d1779..216a34a0590b2 100644 --- a/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h +++ b/DQM/TrackingMonitorSource/interface/StandaloneTrackMonitor.h @@ -31,7 +31,6 @@ class StandaloneTrackMonitor : public DQMEDAnalyzer { protected: void analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override; void processHit(const TrackingRecHit& recHit, edm::EventSetup const& iSetup, const TrackerGeometry& tkGeom, double wfac=1); void processClusters(edm::Event const& iEvent, edm::EventSetup const& iSetup, const TrackerGeometry& tkGeom, double wfac=1); void addClusterToMap(uint32_t detid, const SiStripCluster* cluster); diff --git a/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h b/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h index 54b530029ad6d..bcdcdf1d534de 100644 --- a/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h +++ b/DQM/TrackingMonitorSource/interface/TrackTypeMonitor.h @@ -30,7 +30,6 @@ class TrackTypeMonitor : public DQMEDAnalyzer { protected: void analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; private: diff --git a/DQM/TrackingMonitorSource/plugins/StandaloneTrackMonitor.cc b/DQM/TrackingMonitorSource/plugins/StandaloneTrackMonitor.cc index 30c732298e9d6..588a5cbcd48c6 100644 --- a/DQM/TrackingMonitorSource/plugins/StandaloneTrackMonitor.cc +++ b/DQM/TrackingMonitorSource/plugins/StandaloneTrackMonitor.cc @@ -549,8 +549,6 @@ void StandaloneTrackMonitor::addClusterToMap(uint32_t detid, const SiStripCluste s.insert(cluster); } } -void StandaloneTrackMonitor::endLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& eSetup){ -} // Define this as a plug-in #include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(StandaloneTrackMonitor); diff --git a/DQM/TrackingMonitorSource/plugins/TrackTypeMonitor.cc b/DQM/TrackingMonitorSource/plugins/TrackTypeMonitor.cc index ef59e215f0896..3b4edc2f357e7 100644 --- a/DQM/TrackingMonitorSource/plugins/TrackTypeMonitor.cc +++ b/DQM/TrackingMonitorSource/plugins/TrackTypeMonitor.cc @@ -453,8 +453,6 @@ void TrackTypeMonitor::fillHistograms(const reco::Track& track, int indx) { double chbyndof = (ndof > 0) ? chi2/ndof : 0; trackChi2bynDOFHList_.at(indx)->Fill(chbyndof); } -void TrackTypeMonitor::endLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& eSetup){ -} // Define this as a plug-in #include "FWCore/Framework/interface/MakerMacros.h" DEFINE_FWK_MODULE(TrackTypeMonitor); diff --git a/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h b/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h index 8cbc4bb20fc3d..b90032ba87818 100755 --- a/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h +++ b/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h @@ -40,11 +40,7 @@ class DQMSourceEleCalib : public DQMEDAnalyzer { void analyze(const edm::Event& e, const edm::EventSetup& c) override ; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) override; - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c) override; private: diff --git a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc index 24db17ac11da4..58fe9fdb923ce 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc +++ b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc @@ -118,13 +118,6 @@ void DQMHcalDiJetsAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run } - -//-------------------------------------------------------- -void DQMHcalDiJetsAlCaReco::beginLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { - -} - //------------------------------------------------------------- void DQMHcalDiJetsAlCaReco::analyze(const Event& iEvent, diff --git a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h index dc58eeb123406..12e9e11b40a63 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h +++ b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h @@ -37,8 +37,6 @@ class DQMHcalDiJetsAlCaReco : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(const edm::Event& e, const edm::EventSetup& c) override ; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) override ; private: diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc index e5d91ebf90add..0942fb0e5bb53 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc +++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc @@ -298,10 +298,6 @@ void DQMHcalPhiSymAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run //} //-------------------------------------------------------- -void DQMHcalPhiSymAlCaReco::beginLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { - -} //------------------------------------------------------------- @@ -490,9 +486,6 @@ void DQMHcalPhiSymAlCaReco::analyze(const Event& iEvent, //-------------------------------------------------------- -void DQMHcalPhiSymAlCaReco::endLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { -} //-------------------------------------------------------- void DQMHcalPhiSymAlCaReco::endRun(const Run& r, const EventSetup& context){ // Keep Variances diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h index 1f47614f6b7e2..6455266612544 100644 --- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h +++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h @@ -34,11 +34,7 @@ class DQMHcalPhiSymAlCaReco : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; void analyze(const edm::Event& e, const edm::EventSetup& c) override ; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) override ; - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c) override; void endRun(const edm::Run& r, const edm::EventSetup& c) override; diff --git a/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc b/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc old mode 100755 new mode 100644 index 13a72f3121738..74923d7e6020f --- a/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc +++ b/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc @@ -78,10 +78,6 @@ void DQMSourceEleCalib::bookHistograms(DQMStore::IBooker & ibooker, edm::Run con } //-------------------------------------------------------- -void DQMSourceEleCalib::beginLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { - -} //------------------------------------------------------------- @@ -158,9 +154,6 @@ void DQMSourceEleCalib::analyze(const Event& iEvent, //-------------------------------------------------------- -void DQMSourceEleCalib::endLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { -} //------------------------------------------------ diff --git a/DQMOffline/EGamma/plugins/PhotonOfflineClient.cc b/DQMOffline/EGamma/plugins/PhotonOfflineClient.cc old mode 100755 new mode 100644 index e2645f579d992..7a4b4ea6bb59c --- a/DQMOffline/EGamma/plugins/PhotonOfflineClient.cc +++ b/DQMOffline/EGamma/plugins/PhotonOfflineClient.cc @@ -70,7 +70,6 @@ PhotonOfflineClient::~PhotonOfflineClient() {} //void PhotonOfflineClient::beginJob(){} //void PhotonOfflineClient::analyze(const edm::Event& e, const edm::EventSetup& esup){} -//void PhotonOfflineClient::endLuminosityBlock( const edm::LuminosityBlock& , const edm::EventSetup& setup){} void PhotonOfflineClient::dqmEndJob(DQMStore::IBooker& iBooker, DQMStore::IGetter& iGetter) { diff --git a/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h b/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h index f1d9bc3c6f7fe..25246a969bc92 100644 --- a/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h +++ b/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h @@ -38,7 +38,6 @@ class EcalPileUpDepMonitor: public DQMEDAnalyzer{ /// Analyze void analyze(const edm::Event&, const edm::EventSetup&) override; void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; - void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; private: diff --git a/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc b/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc index 8b0fff55d9518..893c26ba93492 100644 --- a/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc +++ b/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc @@ -34,7 +34,7 @@ EcalPileUpDepMonitor::EcalPileUpDepMonitor(const edm::ParameterSet& ps) { VertexCollection_ = consumes(ps.getParameter("VertexCollection")); - if(ps.existsAs("basicClusterCollection") && ps.getParameter("basicClusterCollection").label() != "") + if(ps.existsAs("basicClusterCollection") && !ps.getParameter("basicClusterCollection").label().empty()) basicClusterCollection_ = consumes >(ps.getParameter("basicClusterCollection")); else{ basicClusterCollection_EE_ = consumes >(ps.getParameter("basicClusterCollection_EE")); @@ -434,10 +434,5 @@ void EcalPileUpDepMonitor::analyze(const edm::Event& e, const edm::EventSetup&) recHitEtEE_PV->Fill(PVCollection_h->size(),RecHitEt_EE); } -void -EcalPileUpDepMonitor::endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) -{ -} - DEFINE_FWK_MODULE(EcalPileUpDepMonitor); diff --git a/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h b/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h index 3ba895ad1b0d7..506d30b9387e0 100644 --- a/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TEGammaOffline.h @@ -56,8 +56,6 @@ class L1TEGammaOffline: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h b/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h index f5d1deebb2121..cd89fb6982292 100644 --- a/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h +++ b/DQMOffline/L1Trigger/interface/L1TStage2CaloLayer2Offline.h @@ -94,8 +94,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/DQMOffline/L1Trigger/interface/L1TTauOffline.h b/DQMOffline/L1Trigger/interface/L1TTauOffline.h index 1f810c45f46f7..43fc0bd4e5503 100644 --- a/DQMOffline/L1Trigger/interface/L1TTauOffline.h +++ b/DQMOffline/L1Trigger/interface/L1TTauOffline.h @@ -100,8 +100,6 @@ class L1TTauOffline: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; const reco::Vertex getPrimaryVertex( edm::Handle const& vertex, edm::Handle const& beamSpot ); diff --git a/DQMOffline/L1Trigger/src/L1TEGammaOffline.cc b/DQMOffline/L1Trigger/src/L1TEGammaOffline.cc index 4729ba3b06e3a..17cae6010da89 100644 --- a/DQMOffline/L1Trigger/src/L1TEGammaOffline.cc +++ b/DQMOffline/L1Trigger/src/L1TEGammaOffline.cc @@ -97,13 +97,6 @@ void L1TEGammaOffline::bookHistograms(DQMStore::IBooker & ibooker, edm::Run cons bookElectronHistos(ibooker); bookPhotonHistos(ibooker); } -// -// -------------------------------------- beginLuminosityBlock -------------------------------------------- -// -void L1TEGammaOffline::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) -{ - edm::LogInfo("L1TEGammaOffline") << "L1TEGammaOffline::beginLuminosityBlock" << std::endl; -} // // -------------------------------------- Analyze -------------------------------------------- @@ -542,14 +535,6 @@ void L1TEGammaOffline::fillPhotons(edm::Event const& e, const unsigned int nVert } } -// -// -------------------------------------- endLuminosityBlock -------------------------------------------- -// -void L1TEGammaOffline::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("L1TEGammaOffline") << "L1TEGammaOffline::endLuminosityBlock" << std::endl; -} - // // -------------------------------------- endRun -------------------------------------------- // diff --git a/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc b/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc index f02f263ab3189..6df1168c33d5d 100644 --- a/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc +++ b/DQMOffline/L1Trigger/src/L1TStage2CaloLayer2Offline.cc @@ -99,15 +99,6 @@ void L1TStage2CaloLayer2Offline::bookHistograms(DQMStore::IBooker & ibooker_, ed //book at beginRun bookHistos(ibooker_); } -// -// -------------------------------------- beginLuminosityBlock -------------------------------------------- -// -void L1TStage2CaloLayer2Offline::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("L1TStage2CaloLayer2Offline") << "L1TStage2CaloLayer2Offline::beginLuminosityBlock" << std::endl; -} - // // -------------------------------------- Analyze -------------------------------------------- // @@ -475,14 +466,6 @@ void L1TStage2CaloLayer2Offline::fillJetEfficiencies(const double &recoEt, } } -// -// -------------------------------------- endLuminosityBlock -------------------------------------------- -// -void L1TStage2CaloLayer2Offline::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("L1TStage2CaloLayer2Offline") << "L1TStage2CaloLayer2Offline::endLuminosityBlock" << std::endl; -} - // // -------------------------------------- endRun -------------------------------------------- // diff --git a/DQMOffline/L1Trigger/src/L1TTauOffline.cc b/DQMOffline/L1Trigger/src/L1TTauOffline.cc index b9a7ba2a7b0f4..f1e1960e111f4 100644 --- a/DQMOffline/L1Trigger/src/L1TTauOffline.cc +++ b/DQMOffline/L1Trigger/src/L1TTauOffline.cc @@ -126,13 +126,6 @@ void L1TTauOffline::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & } } } -// -// -------------------------------------- beginLuminosityBlock -------------------------------------------- -// -void L1TTauOffline::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) -{ - edm::LogInfo("L1TTauOffline") << "L1TTauOffline::beginLuminosityBlock" << std::endl; -} // // -------------------------------------- Analyze -------------------------------------------- @@ -298,14 +291,6 @@ void L1TTauOffline::analyze(edm::Event const& e, edm::EventSetup const& eSetup) }//loop over tau-L1 pairs } -// -// -------------------------------------- endLuminosityBlock -------------------------------------------- -// -void L1TTauOffline::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("L1TTauOffline") << "L1TTauOffline::endLuminosityBlock" << std::endl; -} - // // -------------------------------------- endRun -------------------------------------------- // diff --git a/DQMOffline/Lumi/plugins/ZCounting.cc b/DQMOffline/Lumi/plugins/ZCounting.cc index ef1d13e82f6da..504ec7e0c0f3d 100644 --- a/DQMOffline/Lumi/plugins/ZCounting.cc +++ b/DQMOffline/Lumi/plugins/ZCounting.cc @@ -172,14 +172,6 @@ void ZCounting::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, e h_ee_yield_Z_ebee = ibooker_.book1D("h_ee_yield_Z_ebee", "h_ee_yield_Z_ebee", LumiBin_, LumiMin_, LumiMax_); h_ee_yield_Z_eeee = ibooker_.book1D("h_ee_yield_Z_eeee", "h_ee_yield_Z_eeee", LumiBin_, LumiMin_, LumiMax_); } -// -// -------------------------------------- beginLuminosityBlock -------------------------------------------- -// -void ZCounting::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& context) -{ - edm::LogInfo("ZCounting") << "ZCounting::beginLuminosityBlock" << std::endl; -} - // // -------------------------------------- Analyze -------------------------------------------- @@ -656,14 +648,6 @@ bool ZCounting::ele_tag_selection(double pt, double abseta){ if( (abseta > ELE_ETA_CRACK_LOW) and (abseta < ELE_ETA_CRACK_HIGH) ) return false; return true; } -// -// -------------------------------------- endLuminosityBlock -------------------------------------------- -// -void ZCounting::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("ZCounting") << "ZCounting::endLuminosityBlock" << std::endl; -} - // // -------------------------------------- functions -------------------------------------------- // diff --git a/DQMOffline/Lumi/plugins/ZCounting.h b/DQMOffline/Lumi/plugins/ZCounting.h index 96b2949d11925..cd928e4691798 100644 --- a/DQMOffline/Lumi/plugins/ZCounting.h +++ b/DQMOffline/Lumi/plugins/ZCounting.h @@ -54,8 +54,6 @@ class ZCounting: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; private: //other functions diff --git a/DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h b/DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h index 2fe00a8c1106c..7b4d17034b149 100644 --- a/DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h +++ b/DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h @@ -39,13 +39,6 @@ class DQMOfflineHLTEventInfoClient: public edm::EDAnalyzer { /// Fake Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override ; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) override ; - - /// DQM Client Diagnostic - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c) override; - /// EndRun void endRun(const edm::Run& r, const edm::EventSetup& c) override; diff --git a/DQMOffline/Trigger/interface/HLTInclusiveVBFClient.h b/DQMOffline/Trigger/interface/HLTInclusiveVBFClient.h index 15752ee63a0b6..b8a33aee80459 100644 --- a/DQMOffline/Trigger/interface/HLTInclusiveVBFClient.h +++ b/DQMOffline/Trigger/interface/HLTInclusiveVBFClient.h @@ -60,7 +60,6 @@ class HLTInclusiveVBFClient : public edm::EDAnalyzer { void beginRun(const edm::Run& run, const edm::EventSetup& c) override; void endRun(const edm::Run& run, const edm::EventSetup& c) override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c) override; void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& c) override; virtual void runClient_(); diff --git a/DQMOffline/Trigger/plugins/LepHTMonitor.cc b/DQMOffline/Trigger/plugins/LepHTMonitor.cc index 9b1050579505b..b236f272bbd8b 100644 --- a/DQMOffline/Trigger/plugins/LepHTMonitor.cc +++ b/DQMOffline/Trigger/plugins/LepHTMonitor.cc @@ -245,10 +245,6 @@ void LepHTMonitor::bookHistograms(DQMStore::IBooker &ibooker, ibooker.cd(); } -void LepHTMonitor::beginLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &context) { - edm::LogInfo("LepHTMonitor") << "LepHTMonitor::beginLuminosityBlock\n"; -} void LepHTMonitor::analyze(const edm::Event &e, const edm::EventSetup &eSetup) { edm::LogInfo("LepHTMonitor") << "LepHTMonitor::analyze\n"; @@ -470,11 +466,6 @@ void LepHTMonitor::analyze(const edm::Event &e, const edm::EventSetup &eSetup) { } } -void LepHTMonitor::endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &eSetup) { - edm::LogInfo("LepHTMonitor") - << "LepHTMonitor::endLuminosityBlock\n"; -} void LepHTMonitor::endRun(const edm::Run &run, const edm::EventSetup &eSetup) { edm::LogInfo("LepHTMonitor") << "LepHTMonitor::endRun\n"; diff --git a/DQMOffline/Trigger/plugins/LepHTMonitor.h b/DQMOffline/Trigger/plugins/LepHTMonitor.h index bc91b487880a2..1d5b75e9eb60b 100644 --- a/DQMOffline/Trigger/plugins/LepHTMonitor.h +++ b/DQMOffline/Trigger/plugins/LepHTMonitor.h @@ -60,9 +60,7 @@ class LepHTMonitor: public DQMEDAnalyzer{ protected: void dqmBeginRun(const edm::Run &run, const edm::EventSetup &e) override; void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) override; - void beginLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) override; void analyze(const edm::Event &e, const edm::EventSetup &eSetup) override; - void endLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) override; void endRun(const edm::Run &run, const edm::EventSetup &eSetup) override; private: diff --git a/DQMOffline/Trigger/src/DQMOfflineHLTEventInfoClient.cc b/DQMOffline/Trigger/src/DQMOfflineHLTEventInfoClient.cc index 5b22758af4f35..02f51b4f4da3d 100644 --- a/DQMOffline/Trigger/src/DQMOfflineHLTEventInfoClient.cc +++ b/DQMOffline/Trigger/src/DQMOfflineHLTEventInfoClient.cc @@ -198,13 +198,7 @@ void DQMOfflineHLTEventInfoClient::beginRun(const Run& r, const EventSetup& cont } //-------------------------------------------------------- -void DQMOfflineHLTEventInfoClient::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const EventSetup& context) { - // optionally reset histograms here -} -void DQMOfflineHLTEventInfoClient::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c){ -} //-------------------------------------------------------- void DQMOfflineHLTEventInfoClient::analyze(const Event& e, const EventSetup& context){ diff --git a/DQMOffline/Trigger/src/FSQDiJetAve.cc b/DQMOffline/Trigger/src/FSQDiJetAve.cc index 09ebb6601f7ad..d70305c878c18 100644 --- a/DQMOffline/Trigger/src/FSQDiJetAve.cc +++ b/DQMOffline/Trigger/src/FSQDiJetAve.cc @@ -686,7 +686,7 @@ void HandlerTemplate::getFiltere { // 1. Find matching path. Inside matchin path find matching filter std::string filterFullName = findPathAndFilter(hltConfig)[1]; - if (filterFullName == "") { + if (filterFullName.empty()) { return; } diff --git a/DQMOffline/Trigger/src/GeneralHLTOffline.cc b/DQMOffline/Trigger/src/GeneralHLTOffline.cc index f047aa5d94236..1bfe5460f4779 100644 --- a/DQMOffline/Trigger/src/GeneralHLTOffline.cc +++ b/DQMOffline/Trigger/src/GeneralHLTOffline.cc @@ -57,10 +57,6 @@ class GeneralHLTOffline : public DQMEDAnalyzer { void bookHistograms(DQMStore::IBooker &, edm::Run const & iRun, edm::EventSetup const & iSetup) override; void dqmBeginRun(edm::Run const& iRun,edm::EventSetup const& iSetup) override; - void beginLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&) override; - void endLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&) override; virtual void setupHltMatrix(DQMStore::IBooker & iBooker, const std::string &, int); virtual void fillHltMatrix(const std::string &, const std::string &, @@ -613,13 +609,5 @@ void GeneralHLTOffline::fillHltMatrix(const std::string & label, std::cout << "hist->Fill" << std::endl; } // End fillHltMatrix -void GeneralHLTOffline::beginLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&) { -} - -void -GeneralHLTOffline::endLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&) { -} DEFINE_FWK_MODULE(GeneralHLTOffline); diff --git a/DQMOffline/Trigger/src/HLTInclusiveVBFClient.cc b/DQMOffline/Trigger/src/HLTInclusiveVBFClient.cc index 58899de542b65..a50ab07a514ac 100644 --- a/DQMOffline/Trigger/src/HLTInclusiveVBFClient.cc +++ b/DQMOffline/Trigger/src/HLTInclusiveVBFClient.cc @@ -53,9 +53,6 @@ void HLTInclusiveVBFClient::beginRun(const edm::Run& r, const edm::EventSetup& c } -void HLTInclusiveVBFClient::beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, const edm::EventSetup& context) { - -} void HLTInclusiveVBFClient::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup ) { diff --git a/DQMServices/Components/src/DQMDaqInfo.cc b/DQMServices/Components/src/DQMDaqInfo.cc index e5c2d4466058b..dd224a8ae8f1a 100644 --- a/DQMServices/Components/src/DQMDaqInfo.cc +++ b/DQMServices/Components/src/DQMDaqInfo.cc @@ -50,8 +50,6 @@ void DQMDaqInfo::beginLuminosityBlock(const edm::LuminosityBlock& lumiBlock, con } -void DQMDaqInfo::endLuminosityBlock(const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& iSetup){ -} void diff --git a/DQMServices/Components/src/DQMDaqInfo.h b/DQMServices/Components/src/DQMDaqInfo.h index 1291a43d3d417..cec4afab44c4c 100644 --- a/DQMServices/Components/src/DQMDaqInfo.h +++ b/DQMServices/Components/src/DQMDaqInfo.h @@ -55,7 +55,6 @@ class DQMDaqInfo : public edm::EDAnalyzer { void beginJob() override ; void beginLuminosityBlock(const edm::LuminosityBlock& , const edm::EventSetup&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void endLuminosityBlock(const edm::LuminosityBlock& , const edm::EventSetup&) override; void endJob() override ; DQMStore *dbe_; diff --git a/DQMServices/Components/src/DQMMessageLoggerClient.cc b/DQMServices/Components/src/DQMMessageLoggerClient.cc index 1dddecff43fb9..8bcf933aaf038 100644 --- a/DQMServices/Components/src/DQMMessageLoggerClient.cc +++ b/DQMServices/Components/src/DQMMessageLoggerClient.cc @@ -48,11 +48,7 @@ void DQMMessageLoggerClient::beginRun(const edm::Run& r, const edm::EventSetup& void DQMMessageLoggerClient::analyze(const edm::Event& e, const edm::EventSetup& context) { } -void DQMMessageLoggerClient::beginLuminosityBlock(const edm::LuminosityBlock& lumiBlock, const EventSetup& es){ -} -void DQMMessageLoggerClient::endLuminosityBlock(const edm::LuminosityBlock& lumiBlock, const edm::EventSetup& context){ -} void DQMMessageLoggerClient::fillHistograms(){ diff --git a/DQMServices/Components/src/DQMMessageLoggerClient.h b/DQMServices/Components/src/DQMMessageLoggerClient.h index 5f4eee73150d7..ee7e4db74c857 100644 --- a/DQMServices/Components/src/DQMMessageLoggerClient.h +++ b/DQMServices/Components/src/DQMMessageLoggerClient.h @@ -28,9 +28,7 @@ class DQMMessageLoggerClient : public edm::EDAnalyzer { // Get the analysis void analyze(const edm::Event&, const edm::EventSetup&) override; - void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override; - void endLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup&) override; // Save the histos void endRun(const edm::Run&, const edm::EventSetup&) override; diff --git a/DQMServices/Components/src/DQMStoreStats.cc b/DQMServices/Components/src/DQMStoreStats.cc index f2326aea2daa6..8c782daf4a0a0 100644 --- a/DQMServices/Components/src/DQMStoreStats.cc +++ b/DQMServices/Components/src/DQMStoreStats.cc @@ -652,15 +652,6 @@ void DQMStoreStats::beginJob() { void DQMStoreStats::beginRun(const edm::Run& r, const EventSetup& context) { } - -//==================================================================// -//==================== beginLuminosityBlock ========================// -//==================================================================// -void DQMStoreStats::beginLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { -} - - //==================================================================// //==================== analyse (takes each event) ==================// //==================================================================// diff --git a/DQMServices/Components/src/DQMStoreStats.h b/DQMServices/Components/src/DQMStoreStats.h index 833a4992b219a..a328da4e19371 100644 --- a/DQMServices/Components/src/DQMStoreStats.h +++ b/DQMServices/Components/src/DQMStoreStats.h @@ -309,8 +309,6 @@ class DQMStoreStats : public edm::EDAnalyzer { // Fake Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) override; // DQM Client Diagnostic void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, diff --git a/DQMServices/Components/test/DummyHarvestingClient.cc b/DQMServices/Components/test/DummyHarvestingClient.cc index 198ea62cb0a94..84f981a033776 100644 --- a/DQMServices/Components/test/DummyHarvestingClient.cc +++ b/DQMServices/Components/test/DummyHarvestingClient.cc @@ -199,8 +199,6 @@ class DummyHarvestingClient : public edm::EDAnalyzer { void beginRun(edm::Run const&, edm::EventSetup const&) override; void endRun(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; @@ -305,13 +303,6 @@ DummyHarvestingClient::endRun(edm::Run const&, edm::EventSetup const&) { (*it)->finalizeCumulate(); } -// ------------ method called when starting to processes a luminosity block ------------ -void -DummyHarvestingClient::beginLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&) { -} - -// ------------ method called when ending the processing of a luminosity block ------------ void DummyHarvestingClient::endLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) { diff --git a/DQMServices/Examples/interface/DQMExample_Step1.h b/DQMServices/Examples/interface/DQMExample_Step1.h index d399fa3b85edb..1d4412888d8be 100644 --- a/DQMServices/Examples/interface/DQMExample_Step1.h +++ b/DQMServices/Examples/interface/DQMExample_Step1.h @@ -57,8 +57,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/DQMServices/Examples/interface/DQMSourceExample.h b/DQMServices/Examples/interface/DQMSourceExample.h index 7020914f98297..9c57ddc08fc61 100644 --- a/DQMServices/Examples/interface/DQMSourceExample.h +++ b/DQMServices/Examples/interface/DQMSourceExample.h @@ -34,12 +34,8 @@ class DQMSourceExample : public edm::EDAnalyzer { // Fake Analyze void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& context) override; // DQM Client Diagnostic - void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, - const edm::EventSetup& c) override; // EndRun void endRun(const edm::Run& r, const edm::EventSetup& c) override; diff --git a/DQMServices/Examples/src/DQMExample_Step1.cc b/DQMServices/Examples/src/DQMExample_Step1.cc index 95558a3bfc209..b9d736b4245a6 100644 --- a/DQMServices/Examples/src/DQMExample_Step1.cc +++ b/DQMServices/Examples/src/DQMExample_Step1.cc @@ -69,16 +69,6 @@ void DQMExample_Step1::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run con //book at beginRun bookHistos(ibooker_); } -// -// -------------------------------------- beginLuminosityBlock -------------------------------------------- -// -void DQMExample_Step1::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::beginLuminosityBlock" << std::endl; -} - - // // -------------------------------------- Analyze -------------------------------------------- // @@ -299,14 +289,6 @@ void DQMExample_Step1::analyze(edm::Event const& e, edm::EventSetup const& eSetu h_ePt_diff->Fill(ele1->pt()-ele1_HLT->pt()); } } -// -// -------------------------------------- endLuminosityBlock -------------------------------------------- -// -void DQMExample_Step1::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::endLuminosityBlock" << std::endl; -} - // // -------------------------------------- endRun -------------------------------------------- diff --git a/DQMServices/Examples/src/DQMSourceExample.cc b/DQMServices/Examples/src/DQMSourceExample.cc index fd102680e76af..74bdd1870c0ff 100644 --- a/DQMServices/Examples/src/DQMSourceExample.cc +++ b/DQMServices/Examples/src/DQMSourceExample.cc @@ -144,15 +144,6 @@ void DQMSourceExample::beginJob() { void DQMSourceExample::beginRun(const edm::Run& r, const EventSetup& context) { } - -//==================================================================// -//==================== beginLuminosityBlock ========================// -//==================================================================// -void DQMSourceExample::beginLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { -} - - //==================================================================// //==================== analyse (takes each event) ==================// //==================================================================// @@ -215,14 +206,6 @@ void DQMSourceExample::analyze(const Event& iEvent, const EventSetup& iSetup) { } -//==================================================================// -//========================= endLuminosityBlock =====================// -//==================================================================// -void DQMSourceExample::endLuminosityBlock(const LuminosityBlock& lumiSeg, - const EventSetup& context) { - -} - //==================================================================// //============================= endRun =============================// //==================================================================// diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h index 98cba504afb00..5ba3d94b56910 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h @@ -46,8 +46,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h index 7af86d34eaac6..1840abb55bd37 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h @@ -42,8 +42,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h index 5e80d5290ff41..f4744645d2bfd 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h @@ -39,8 +39,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h index cfc813b7ee9e8..7936ed9aabd7d 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h @@ -46,8 +46,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h index 552d6500b8b45..9242b18f10839 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h @@ -42,8 +42,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h index 2cb6547ac1220..81440322cf3ac 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h @@ -35,8 +35,6 @@ class SUSY_HLT_InclusiveHT: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h index 71ca1409d3e5e..0578f9564b781 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h @@ -46,8 +46,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h index 03610cabe21f3..d8d19e8293ee9 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h @@ -46,8 +46,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h index 1d3d5b0e2d4e9..7e29031c20e55 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h @@ -39,8 +39,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h index 3e8c7a9501e00..104f7a9cb3432 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h @@ -46,8 +46,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h index ce46f3e35d3e5..4c8189b873974 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h @@ -37,8 +37,6 @@ class SUSY_HLT_PhotonHT: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override ; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h index 7d09eee4d993f..925b342a79919 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h @@ -37,8 +37,6 @@ class SUSY_HLT_PhotonMET: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h index 6e7be5884eb3f..e38fe948a26a3 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h @@ -47,8 +47,6 @@ class SUSY_HLT_Razor: 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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h index 2af33e268384b..2586557647f6b 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h @@ -56,9 +56,7 @@ class SUSY_HLT_SingleLepton: public DQMEDAnalyzer{ protected: void dqmBeginRun(const edm::Run &run, const edm::EventSetup &e) override; void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) override; - void beginLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) override; void analyze(const edm::Event &e, const edm::EventSetup &eSetup) override; - void endLuminosityBlock(const edm::LuminosityBlock &lumi, const edm::EventSetup &eSetup) override; void endRun(const edm::Run &run, const edm::EventSetup &eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h index 32c77fea22ca1..578360457e723 100755 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h @@ -46,8 +46,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h index e68d541286e4b..8cdcdd2560e61 100644 --- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h +++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h @@ -45,8 +45,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 beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; - void endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& eSetup) override; void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override; private: diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc index dd398148c0043..73a0f7bc26818 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc @@ -67,11 +67,6 @@ void SUSY_HLT_DiJet_MET::dqmBeginRun(edm::Run const &run, edm::EventSetup const bookHistos(ibooker_); } -void SUSY_HLT_DiJet_MET::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::beginLuminosityBlock" << std::endl; -} @@ -225,10 +220,6 @@ void SUSY_HLT_DiJet_MET::analyze(edm::Event const& e, edm::EventSetup const& eSe } -void SUSY_HLT_DiJet_MET::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::endLuminosityBlock" << std::endl; -} void SUSY_HLT_DiJet_MET::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc index 6b2a6824bc3d1..c09e8a20125e1 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc @@ -65,11 +65,6 @@ void SUSY_HLT_DoubleEle_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, e bookHistos(ibooker_); } -void SUSY_HLT_DoubleEle_Hadronic::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::beginLuminosityBlock" << std::endl; -} @@ -218,10 +213,6 @@ void SUSY_HLT_DoubleEle_Hadronic::analyze(edm::Event const& e, edm::EventSetup c } -void SUSY_HLT_DoubleEle_Hadronic::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::endLuminosityBlock" << std::endl; -} void SUSY_HLT_DoubleEle_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc index a11b1159c92ff..d449a45d6c4d7 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc @@ -65,11 +65,6 @@ void SUSY_HLT_DoubleMuon_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, bookHistos(ibooker_); } -void SUSY_HLT_DoubleMuon_Hadronic::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::beginLuminosityBlock" << std::endl; -} @@ -208,10 +203,6 @@ void SUSY_HLT_DoubleMuon_Hadronic::analyze(edm::Event const& e, edm::EventSetup } -void SUSY_HLT_DoubleMuon_Hadronic::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::endLuminosityBlock" << std::endl; -} void SUSY_HLT_DoubleMuon_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc index 7401c44161b8f..fb35918b8b95b 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc @@ -56,11 +56,6 @@ void SUSY_HLT_ElecFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const bookHistos(ibooker_); } -void SUSY_HLT_ElecFakes::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::beginLuminosityBlock" << std::endl; -} @@ -115,10 +110,6 @@ void SUSY_HLT_ElecFakes::analyze(edm::Event const& e, edm::EventSetup const& eSe } -void SUSY_HLT_ElecFakes::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::endLuminosityBlock" << std::endl; -} void SUSY_HLT_ElecFakes::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc index 60140f32f4dc0..9f865bc1c6af8 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc @@ -61,11 +61,6 @@ void SUSY_HLT_Electron_BJet::bookHistograms(DQMStore::IBooker & ibooker_, edm::R bookHistos(ibooker_); } -void SUSY_HLT_Electron_BJet::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::beginLuminosityBlock" << std::endl; -} @@ -130,10 +125,6 @@ void SUSY_HLT_Electron_BJet::analyze(edm::Event const& e, edm::EventSetup const& } -void SUSY_HLT_Electron_BJet::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::endLuminosityBlock" << std::endl; -} void SUSY_HLT_Electron_BJet::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc index 5ae973a67dc16..7072ec1af8816 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc @@ -39,11 +39,6 @@ void SUSY_HLT_InclusiveHT::dqmBeginRun(edm::Run const &, edm::EventSetup const & bookHistos(ibooker_); } -void SUSY_HLT_InclusiveHT::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::beginLuminosityBlock" << std::endl; -} void SUSY_HLT_InclusiveHT::analyze(edm::Event const& e, edm::EventSetup const& eSetup){ edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::analyze" << std::endl; @@ -162,10 +157,6 @@ void SUSY_HLT_InclusiveHT::analyze(edm::Event const& e, edm::EventSetup const& e } -void SUSY_HLT_InclusiveHT::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::endLuminosityBlock" << std::endl; -} void SUSY_HLT_InclusiveHT::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc index 3dc5f6f6bfdb1..acd40c08f563a 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc @@ -67,11 +67,6 @@ void SUSY_HLT_MuEle_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, edm:: bookHistos(ibooker_); } -void SUSY_HLT_MuEle_Hadronic::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::beginLuminosityBlock" << std::endl; -} @@ -263,10 +258,6 @@ void SUSY_HLT_MuEle_Hadronic::analyze(edm::Event const& e, edm::EventSetup const } -void SUSY_HLT_MuEle_Hadronic::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::endLuminosityBlock" << std::endl; -} void SUSY_HLT_MuEle_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc index a5fa460509adb..15f1728ad075c 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc @@ -54,11 +54,6 @@ void SUSY_HLT_MuonFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const bookHistos(ibooker_); } -void SUSY_HLT_MuonFakes::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::beginLuminosityBlock" << std::endl; -} @@ -113,10 +108,6 @@ void SUSY_HLT_MuonFakes::analyze(edm::Event const& e, edm::EventSetup const& eSe } -void SUSY_HLT_MuonFakes::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::endLuminosityBlock" << std::endl; -} void SUSY_HLT_MuonFakes::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc index b282ce838a03c..0d8ce6c1e3ed4 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc @@ -61,11 +61,6 @@ void SUSY_HLT_Muon_BJet::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run c bookHistos(ibooker_); } -void SUSY_HLT_Muon_BJet::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::beginLuminosityBlock" << std::endl; -} @@ -122,10 +117,6 @@ void SUSY_HLT_Muon_BJet::analyze(edm::Event const& e, edm::EventSetup const& eSe } -void SUSY_HLT_Muon_BJet::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::endLuminosityBlock" << std::endl; -} void SUSY_HLT_Muon_BJet::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc index f12d5b2609aac..19f822158b3d0 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc @@ -73,11 +73,6 @@ void SUSY_HLT_Muon_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup co bookHistos(ibooker_); } -void SUSY_HLT_Muon_Hadronic::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::beginLuminosityBlock" << std::endl; -} @@ -243,10 +238,6 @@ void SUSY_HLT_Muon_Hadronic::analyze(edm::Event const& e, edm::EventSetup const& } -void SUSY_HLT_Muon_Hadronic::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::endLuminosityBlock" << std::endl; -} void SUSY_HLT_Muon_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc index ad975cebb465b..5c87940a9138f 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc @@ -39,11 +39,6 @@ void SUSY_HLT_PhotonHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &) bookHistos(ibooker_); } -void SUSY_HLT_PhotonHT::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::beginLuminosityBlock" << std::endl; -} void SUSY_HLT_PhotonHT::analyze(edm::Event const& e, edm::EventSetup const& eSetup){ edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::analyze" << std::endl; @@ -132,10 +127,6 @@ void SUSY_HLT_PhotonHT::analyze(edm::Event const& e, edm::EventSetup const& eSet } -void SUSY_HLT_PhotonHT::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::endLuminosityBlock" << std::endl; -} void SUSY_HLT_PhotonHT::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc index 062308b0ba775..af55630c089f6 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc @@ -36,11 +36,6 @@ void SUSY_HLT_PhotonMET::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run c bookHistos(ibooker_); } -void SUSY_HLT_PhotonMET::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::beginLuminosityBlock" << std::endl; -} void SUSY_HLT_PhotonMET::analyze(edm::Event const& e, edm::EventSetup const& eSetup) { @@ -103,10 +98,6 @@ void SUSY_HLT_PhotonMET::analyze(edm::Event const& e, edm::EventSetup const& eSe } } -void SUSY_HLT_PhotonMET::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::endLuminosityBlock" << std::endl; -} void SUSY_HLT_PhotonMET::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc index 8a0010f7f9ee7..ee3b6c072f305 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc @@ -37,11 +37,6 @@ void SUSY_HLT_Razor::dqmBeginRun(edm::Run const &, edm::EventSetup const &) bookHistos(ibooker_); } -void SUSY_HLT_Razor::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::beginLuminosityBlock" << std::endl; -} void SUSY_HLT_Razor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; @@ -215,10 +210,6 @@ void SUSY_HLT_Razor::analyze(edm::Event const& e, edm::EventSetup const& eSetup) } -void SUSY_HLT_Razor::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::endLuminosityBlock" << std::endl; -} void SUSY_HLT_Razor::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc index 419d933047e97..0a1a69938fff4 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc @@ -248,9 +248,9 @@ void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker, bool is_mu = false; bool is_ele = false; - if(theElectronTag_.label() == "" && theMuonTag_.label() != ""){ + if(theElectronTag_.label().empty() && !theMuonTag_.label().empty()){ is_mu=true; - }else if(theElectronTag_.label() != "" && theMuonTag_.label() == ""){ + }else if(!theElectronTag_.label().empty() && theMuonTag_.label().empty()){ is_ele=true; } std::string lepton="lepton", Lepton="Lepton"; @@ -273,19 +273,19 @@ void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker, (";"+Lepton+" #phi;").c_str(), 20, -3.5, 3.5); - if(theHLTHTTag_.label()!=""){ + if(!theHLTHTTag_.label().empty()){ h_HT_ = ibooker.book1D("HT", ";HLT HT [GeV];", 40, 0.0, 1000.0); } - if(theHLTMETTag_.label()!=""){ + if(!theHLTMETTag_.label().empty()){ h_MET_ = ibooker.book1D("MET", ";HLT MET [GeV];", 40, 0.0, 1000.0); } - if(theHLTJetCollectionTag_.label()!="" && theHLTJetTagCollectionTag_.label()!=""){ + if(!theHLTJetCollectionTag_.label().empty() && !theHLTJetTagCollectionTag_.label().empty()){ h_maxCSV_ = ibooker.book1D("maxCSV", ";Max HLT CSV;", 20, 0.0, 1.0); @@ -305,7 +305,7 @@ void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker, "Denominator;Offline H_{T} [GeV];", 30, 0.0, 1500.0 ); - if(theHLTMETTag_.label()!=""){ + if(!theHLTMETTag_.label().empty()){ h_pfMetTurnOn_num_ = ibooker.book1D("pfMetTurnOn_num", "Numerator;Offline MET [GeV];", 20, 0.0, 500.0 ); @@ -314,7 +314,7 @@ void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker, 20, 0.0, 500.0 ); } - if(theHLTJetCollectionTag_.label()!="" && theHLTJetTagCollectionTag_.label()!=""){ + if(!theHLTJetCollectionTag_.label().empty() && !theHLTJetTagCollectionTag_.label().empty()){ h_CSVTurnOn_num_ = ibooker.book1D("CSVTurnOn_num", "Numerator;Offline Max CSV Discriminant;", 20, 0.0, 1.0); @@ -335,10 +335,6 @@ void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker, ibooker.cd(); } -void SUSY_HLT_SingleLepton::beginLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &context){ - edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::beginLuminosityBlock\n"; -} void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup &eSetup){ edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::analyze\n"; @@ -346,7 +342,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //HLT HT edm::Handle HLTHT; - if(theHLTHTTag_.label() != ""){ + if(!theHLTHTTag_.label().empty()){ e.getByToken(theHLTHT_, HLTHT); if( !HLTHT.isValid() ){ edm::LogInfo("SUSY_HLT_SingleLepton") @@ -356,7 +352,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //HLT MET edm::Handle HLTMET; - if(theHLTMETTag_.label() != ""){ + if(!theHLTMETTag_.label().empty()){ e.getByToken(theHLTMET_, HLTMET); if( !HLTMET.isValid() ){ edm::LogInfo("SUSY_HLT_SingleLepton") @@ -366,7 +362,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //HLT Jets edm::Handle HLTJetCollection; - if(theHLTJetCollectionTag_.label() != ""){ + if(!theHLTJetCollectionTag_.label().empty()){ e.getByToken(theHLTJetCollection_, HLTJetCollection); if( !HLTJetCollection.isValid() ){ edm::LogInfo("SUSY_HLT_SingleLepton") @@ -376,7 +372,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //HLT Jet Tags edm::Handle HLTJetTagCollection; - if(theHLTJetTagCollectionTag_.label() != ""){ + if(!theHLTJetTagCollectionTag_.label().empty()){ e.getByToken(theHLTJetTagCollection_, HLTJetTagCollection); if( !HLTJetTagCollection.isValid() ){ edm::LogInfo("SUSY_HLT_SingleLepton") @@ -386,7 +382,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Vertex edm::Handle VertexCollection; - if(theVertexCollectionTag_.label() != ""){ + if(!theVertexCollectionTag_.label().empty()){ e.getByToken(theVertexCollection_, VertexCollection); if( !VertexCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -396,7 +392,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Conversions edm::Handle ConversionCollection; - if(theConversionCollectionTag_.label() != ""){ + if(!theConversionCollectionTag_.label().empty()){ e.getByToken(theConversionCollection_, ConversionCollection); if( !ConversionCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -406,7 +402,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Beam Spot edm::Handle BeamSpot; - if(theBeamSpotTag_.label() != ""){ + if(!theBeamSpotTag_.label().empty()){ e.getByToken(theBeamSpot_, BeamSpot); if( !BeamSpot.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -416,7 +412,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //MET edm::Handle pfMETCollection; - if(thePfMETTag_.label() != ""){ + if(!thePfMETTag_.label().empty()){ e.getByToken(thePfMETCollection_, pfMETCollection); if( !pfMETCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -426,7 +422,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Jets edm::Handle pfJetCollection; - if(thePfJetTag_.label() != ""){ + if(!thePfJetTag_.label().empty()){ e.getByToken (thePfJetCollection_,pfJetCollection); if( !pfJetCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -436,7 +432,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //b-tags edm::Handle jetTagCollection; - if(theJetTagTag_.label() != ""){ + if(!theJetTagTag_.label().empty()){ e.getByToken(theJetTagCollection_, jetTagCollection); if( !jetTagCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -446,7 +442,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Electron edm::Handle ElectronCollection; - if(theElectronTag_.label() != ""){ + if(!theElectronTag_.label().empty()){ e.getByToken (theElectronCollection_, ElectronCollection); if( !ElectronCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -456,7 +452,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Muon edm::Handle MuonCollection; - if(theMuonTag_.label() != ""){ + if(!theMuonTag_.label().empty()){ e.getByToken (theMuonCollection_, MuonCollection); if( !MuonCollection.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -466,7 +462,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & //Trigger edm::Handle hltresults; - if(theTriggerResultsTag_.label() != ""){ + if(!theTriggerResultsTag_.label().empty()){ e.getByToken(theTriggerResults_, hltresults); if( !hltresults.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -474,7 +470,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & } } edm::Handle triggerSummary; - if(theTrigSummaryTag_.label() != ""){ + if(!theTrigSummaryTag_.label().empty()){ e.getByToken(theTrigSummary_, triggerSummary); if( !triggerSummary.isValid() ){ edm::LogWarning("SUSY_HLT_SingleLepton") @@ -615,7 +611,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & const bool csv_plateau = maxCSV>csv_threshold_ || csv_threshold_<0.0; //Fill lepton turn-on histograms - if(hasFiredLeptonAuxiliary || triggerPathLeptonAuxiliary_=="" || !e.isRealData()){ + if(hasFiredLeptonAuxiliary || triggerPathLeptonAuxiliary_.empty() || !e.isRealData()){ //Fill histograms using highest pt reco lepton if(ht_plateau && met_plateau && csv_plateau && (pfMET>metCut_ || metCut_<0.0) @@ -626,7 +622,7 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & } //Fill remaining turn-on histograms - if(hasFiredAuxiliary || triggerPathAuxiliary_=="" || !e.isRealData()){ + if(hasFiredAuxiliary || triggerPathAuxiliary_.empty() || !e.isRealData()){ //Fill HT efficiency plot if(lep_plateau && met_plateau && csv_plateau){ if(h_pfHTTurnOn_den_) h_pfHTTurnOn_den_->Fill(pfHT); @@ -694,11 +690,6 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup & } } -void SUSY_HLT_SingleLepton::endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &eSetup){ - edm::LogInfo("SUSY_HLT_SingleLepton") - << "SUSY_HLT_SingleLepton::endLuminosityBlock\n"; -} void SUSY_HLT_SingleLepton::endRun(const edm::Run &run, const edm::EventSetup &eSetup){ edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::endRun\n"; diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc old mode 100755 new mode 100644 index e57e11e8072d1..a99851ccd5aa1 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc @@ -84,11 +84,6 @@ void SUSY_HLT_VBF_Mu::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run cons bookHistos(ibooker_); } -void SUSY_HLT_VBF_Mu::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::beginLuminosityBlock" << std::endl; -} @@ -376,10 +371,6 @@ void SUSY_HLT_VBF_Mu::analyze(edm::Event const& e, edm::EventSetup const& eSetup } -void SUSY_HLT_VBF_Mu::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::endLuminosityBlock" << std::endl; -} void SUSY_HLT_VBF_Mu::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc index 8b968ff70e2aa..2c085252c315e 100644 --- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc +++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc @@ -70,11 +70,6 @@ void SUSY_HLT_alphaT::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) bookHistos(ibooker_); } -void SUSY_HLT_alphaT::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, - edm::EventSetup const& context) -{ - edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::beginLuminosityBlock" << std::endl; -} @@ -226,10 +221,6 @@ void SUSY_HLT_alphaT::analyze(edm::Event const& e, edm::EventSetup const& eSetup } -void SUSY_HLT_alphaT::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) -{ - edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::endLuminosityBlock" << std::endl; -} void SUSY_HLT_alphaT::endRun(edm::Run const& run, edm::EventSetup const& eSetup) diff --git a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc index ecd568966b4b9..3a040bcbcc340 100644 --- a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc +++ b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.cc @@ -512,7 +512,5 @@ void Phase2TrackerMonitorDigi::bookLayerHistos(DQMStore::IBooker & ibooker, unsi layerMEs.insert(std::make_pair(layer, local_mes)); } } -void Phase2TrackerMonitorDigi::endLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& eSetup){ -} //define this as a plug-in DEFINE_FWK_MODULE(Phase2TrackerMonitorDigi); diff --git a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.h b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.h index 109aa9a959b66..6f255accc0085 100644 --- a/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.h +++ b/SimTracker/SiPhase2Digitizer/test/Phase2TrackerMonitorDigi.h @@ -26,7 +26,6 @@ class Phase2TrackerMonitorDigi : public DQMEDAnalyzer{ 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; - void endLuminosityBlock(edm::LuminosityBlock const& lumiBlock, edm::EventSetup const& iSetup) override; struct DigiMEs{ diff --git a/Validation/RecoEgamma/plugins/ConversionPostprocessing.cc b/Validation/RecoEgamma/plugins/ConversionPostprocessing.cc index 7bad9b5ebaf62..517ce0e714dec 100644 --- a/Validation/RecoEgamma/plugins/ConversionPostprocessing.cc +++ b/Validation/RecoEgamma/plugins/ConversionPostprocessing.cc @@ -164,11 +164,6 @@ void ConversionPostprocessing::runPostprocessing() } -void ConversionPostprocessing::endLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& setup) -{ - - -} diff --git a/Validation/RecoEgamma/plugins/ConversionPostprocessing.h b/Validation/RecoEgamma/plugins/ConversionPostprocessing.h index 8ae1d3027a34c..73714241b74f9 100644 --- a/Validation/RecoEgamma/plugins/ConversionPostprocessing.h +++ b/Validation/RecoEgamma/plugins/ConversionPostprocessing.h @@ -62,7 +62,6 @@ class ConversionPostprocessing : public edm::EDAnalyzer void analyze(const edm::Event&, const edm::EventSetup& ) override ; void beginJob() override ; void endJob() override ; - void endLuminosityBlock( const edm::LuminosityBlock& , const edm::EventSetup& ) override ; void endRun(const edm::Run& , const edm::EventSetup& ) override ; private: diff --git a/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc b/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc old mode 100755 new mode 100644 index a6fc5cab8027e..d6fe64f961f44 --- a/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc +++ b/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc @@ -297,11 +297,6 @@ void PhotonPostprocessing::runPostprocessing() } -void PhotonPostprocessing::endLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup& setup) -{ - - -} diff --git a/Validation/RecoEgamma/plugins/PhotonPostprocessing.h b/Validation/RecoEgamma/plugins/PhotonPostprocessing.h index 3a3b244d41070..2986494567764 100755 --- a/Validation/RecoEgamma/plugins/PhotonPostprocessing.h +++ b/Validation/RecoEgamma/plugins/PhotonPostprocessing.h @@ -62,7 +62,6 @@ class PhotonPostprocessing : public edm::EDAnalyzer void analyze(const edm::Event&, const edm::EventSetup& ) override ; void beginJob() override ; void endJob() override ; - void endLuminosityBlock( const edm::LuminosityBlock& , const edm::EventSetup& ) override ; void endRun(const edm::Run& , const edm::EventSetup& ) override ;