Remove dqmEndRun from DQMEDAnalyzer.

... and also dqmBegin/EndLumi. This includes lots of automated changes to remove "empty" dqmBeginRun and dqmEndRun. dqmBeginRun remains allowed in DQMEDAnalyzer; it is called before booking and ME cannot (and must not) be accessed there. Any local member intialization should be fine to do there; it will be called for each of the edm::stream instancs once we switch back to stream. Technically all the code could simply be moved into bookHistograms, but having a separate beginRun makes more sense logically. Many dqmEndRun that only contain log messages and printouts where removed, even if they were more than basic debugging output. The remaining modules with non-trivial dqmEndRuns are converted to DQMOneEDAnalyzer. Commands like sed -i '/dqmBeginRun/,+3d' $(ag \ 'dqm(Begin|End)Run[^\n]*\n[^\n]*LogInfo[^\n]*\n\s*}' -l) were used to delete "useless" bodies.
cms-sw · Dec 4, 2019 · 2b4f4af · 2b4f4af
1 parent 2af6c66
commit 2b4f4af
Show file tree

Hide file tree

Showing 153 changed files with 45 additions and 438 deletions.
diff --git a/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc b/DQM/CTPPS/plugins/CTPPSDiamondDQMSource.cc
@@ -75,7 +75,6 @@ class CTPPSDiamondDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<
   std::shared_ptr<dds::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock&,
                                                          const edm::EventSetup&) const override;
   void globalEndLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
-  void dqmEndRun(const edm::Run&, const edm::EventSetup&) override;
 
 private:
   // Constants
@@ -1194,8 +1193,4 @@ void CTPPSDiamondDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock&
 
 //----------------------------------------------------------------------------------------------------
 
-void CTPPSDiamondDQMSource::dqmEndRun(const edm::Run&, const edm::EventSetup&) {}
-
-//----------------------------------------------------------------------------------------------------
-
 DEFINE_FWK_MODULE(CTPPSDiamondDQMSource);
diff --git a/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc b/DQM/CTPPS/plugins/CTPPSPixelDQMSource.cc
@@ -38,7 +38,6 @@ class CTPPSPixelDQMSource : public DQMEDAnalyzer {
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
-  void dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
 private:
   unsigned int verbosity;
@@ -639,14 +638,5 @@ void CTPPSPixelDQMSource::analyze(edm::Event const &event, edm::EventSetup const
     LogPrint("CTPPSPixelDQMSource") << "analyze event " << nEvents;
 }
 
-//-----------------------------------------------------------------------------
-void CTPPSPixelDQMSource::dqmEndRun(edm::Run const &run, edm::EventSetup const &eSetup) {
-  if (!verbosity)
-    return;
-  LogPrint("CTPPSPixelDQMSource") << "end of Run " << run.run() << ": " << nEvents << " events\n"
-                                  << "multHitsMax= " << multHitsMax << "   cluSizeMax= " << cluSizeMax
-                                  << "\nx0: " << x0_MIN << "/" << x0_MAX << "y0: " << y0_MIN << "/" << y0_MAX << "\n";
-}
-
 //---------------------------------------------------------------------------
 DEFINE_FWK_MODULE(CTPPSPixelDQMSource);
diff --git a/DQM/CTPPS/plugins/TotemTimingDQMSource.cc b/DQM/CTPPS/plugins/TotemTimingDQMSource.cc
@@ -58,7 +58,6 @@ class TotemTimingDQMSource : public DQMOneEDAnalyzer<edm::LuminosityBlockCache<t
   std::shared_ptr<totemds::Cache> globalBeginLuminosityBlock(const edm::LuminosityBlock &,
                                                              const edm::EventSetup &) const override;
   void globalEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
-  void dqmEndRun(const edm::Run &, const edm::EventSetup &) override;
 
 private:
   // Constants
@@ -779,10 +778,4 @@ void TotemTimingDQMSource::globalEndLuminosityBlock(const edm::LuminosityBlock &
   }
 }
 
-//----------------------------------------------------------------------------------------------------
-
-void TotemTimingDQMSource::dqmEndRun(const edm::Run &, const edm::EventSetup &) {}
-
-//----------------------------------------------------------------------------------------------------
-
 DEFINE_FWK_MODULE(TotemTimingDQMSource);
diff --git a/DQM/CastorMonitor/interface/CastorMonitorModule.h b/DQM/CastorMonitor/interface/CastorMonitorModule.h
@@ -15,7 +15,7 @@
 #include "DataFormats/L1Trigger/interface/BXVector.h"
 #include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h"
 
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
@@ -39,13 +39,6 @@
 #include "DataFormats/CastorReco/interface/CastorCluster.h"
 #include "DataFormats/CastorReco/interface/CastorJet.h"
 #include "DataFormats/CastorReco/interface/CastorTower.h"
-#include "DataFormats/JetReco/interface/BasicJet.h"
-#include "DataFormats/JetReco/interface/BasicJetCollection.h"
-#include "DataFormats/JetReco/interface/CastorJetID.h"
-#include "DataFormats/JetReco/interface/Jet.h"
-#include "RecoJets/JetProducers/interface/CastorJetIDHelper.h"
-#include "RecoJets/JetProducers/plugins/CastorJetIDProducer.h"
-
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
@@ -69,7 +62,7 @@
 #include <sys/time.h>
 #include <vector>
 
-class CastorMonitorModule : public DQMEDAnalyzer {
+class CastorMonitorModule : public DQMOneEDAnalyzer<> {
 public:
   CastorMonitorModule(const edm::ParameterSet &ps);
   ~CastorMonitorModule() override;

diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitor.cc b/DQM/HLTEvF/plugins/HLTObjectMonitor.cc
@@ -94,7 +94,6 @@ class HLTObjectMonitor : public DQMEDAnalyzer {
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override;
   void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndRun(edm::Run const&, edm::EventSetup const&) override;
   vector<hltPlot*> plotList;
   //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
   //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
@@ -791,11 +790,6 @@ void HLTObjectMonitor::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const&
 
 // ------------ method called when ending the processing of a run  ------------
 
-void HLTObjectMonitor::dqmEndRun(edm::Run const&, edm::EventSetup const&) {
-  if (debugPrint)
-    std::cout << "Calling endRun. " << std::endl;
-}
-
 void HLTObjectMonitor::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& iSetup) {
   ////////////////////////////////
   ///

diff --git a/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc b/DQM/HLTEvF/plugins/HLTObjectMonitorProtonLead.cc
@@ -93,7 +93,6 @@ class HLTObjectMonitorProtonLead : public DQMEDAnalyzer {
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& i, edm::Run const&, edm::EventSetup const&) override;
   void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndRun(edm::Run const&, edm::EventSetup const&) override;
   vector<hltPlot*> plotList;
   //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
   //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
@@ -608,11 +607,6 @@ void HLTObjectMonitorProtonLead::dqmBeginRun(edm::Run const& iRun, edm::EventSet
 
 // ------------ method called when ending the processing of a run  ------------
 
-void HLTObjectMonitorProtonLead::dqmEndRun(edm::Run const&, edm::EventSetup const&) {
-  if (debugPrint)
-    std::cout << "Calling endRun. " << std::endl;
-}
-
 void HLTObjectMonitorProtonLead::bookHistograms(DQMStore::IBooker& ibooker,
                                                 edm::Run const& iRun,
                                                 edm::EventSetup const& iSetup) {

diff --git a/DQM/L1TMonitor/interface/BxTiming.h b/DQM/L1TMonitor/interface/BxTiming.h
@@ -36,7 +36,6 @@ class BxTiming : public DQMEDAnalyzer {
   ~BxTiming() override;
 
 protected:
-  void dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
 

diff --git a/DQM/L1TMonitor/interface/L1ExtraDQM.h b/DQM/L1TMonitor/interface/L1ExtraDQM.h
@@ -66,12 +66,12 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 
 #include "boost/lexical_cast.hpp"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 
 // forward declarations
 
 // class declaration
-class L1ExtraDQM : public DQMEDAnalyzer {
+class L1ExtraDQM : public DQMOneEDAnalyzer<> {
 public:
   // constructor(s)
   explicit L1ExtraDQM(const edm::ParameterSet&);

diff --git a/DQM/L1TMonitor/interface/L1GtHwValidation.h b/DQM/L1TMonitor/interface/L1GtHwValidation.h
@@ -105,7 +105,6 @@ class L1GtHwValidation : public DQMEDAnalyzer {
 
 protected:
   void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   //virtual void analyze(DQMStore::IBooker &ibooker, const edm::Event&, const edm::EventSetup&);
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1TCSCTF.h b/DQM/L1TMonitor/interface/L1TCSCTF.h
@@ -66,8 +66,6 @@ class L1TCSCTF : public DQMEDAnalyzer {
 protected:
   // Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
-  //virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1TCSCTPG.h b/DQM/L1TMonitor/interface/L1TCSCTPG.h
@@ -49,7 +49,6 @@ class L1TCSCTPG : public DQMEDAnalyzer {
 protected:
   // Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1TDEMON.h b/DQM/L1TMonitor/interface/L1TDEMON.h
@@ -31,9 +31,7 @@ class L1TDEMON : public DQMEDAnalyzer {
   ~L1TDEMON() override;
 
 protected:
-  //virtual void beginJob(void) ;
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1TGCT.h b/DQM/L1TMonitor/interface/L1TGCT.h
@@ -128,7 +128,6 @@ class L1TGCT : public DQMEDAnalyzer {
   // Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1TGMT.h b/DQM/L1TMonitor/interface/L1TGMT.h
@@ -51,9 +51,6 @@ class L1TGMT : public DQMEDAnalyzer {
   // Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  // BeginJob
-
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1THIonImp.h b/DQM/L1TMonitor/interface/L1THIonImp.h
@@ -27,7 +27,6 @@ class L1THIonImp : public DQMEDAnalyzer {
   // Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) override;
   //virtual std::vector<int> SortMinBiasBit(std::vector<int>, std::vector<int>);
   virtual std::vector<int> SortMinBiasBit(uint16_t, uint16_t);

diff --git a/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h b/DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h
@@ -25,7 +25,6 @@ class L1TMP7ZeroSupp : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 protected:
-  void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override;
   void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override;
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 

diff --git a/DQM/L1TMonitor/interface/L1TPUM.h b/DQM/L1TMonitor/interface/L1TPUM.h
@@ -30,7 +30,6 @@ class L1TPUM : public DQMEDAnalyzer {
 protected:
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
   void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
 
 private:
   edm::EDGetTokenT<L1CaloRegionCollection> regionSource_;

diff --git a/DQM/L1TMonitor/interface/L1TStage2BMTF.h b/DQM/L1TMonitor/interface/L1TStage2BMTF.h
@@ -60,7 +60,6 @@ class L1TStage2BMTF : public DQMEDAnalyzer {
   // member functions
 protected:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override;
 
   // data members

diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h
@@ -85,7 +85,6 @@ class L1TStage2CaloLayer1 : public DQMOneEDAnalyzer<edm::one::WatchLuminosityBlo
 protected:
   void analyze(const edm::Event &e, const edm::EventSetup &c) override;
   void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) override;
-  void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void beginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
   void endLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
 

diff --git a/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h b/DQM/L1TMonitor/interface/L1TStage2CaloLayer2.h
@@ -25,7 +25,6 @@ class L1TStage2CaloLayer2 : public DQMEDAnalyzer {
 
 protected:
   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;
 
 private:

diff --git a/DQM/L1TMonitor/interface/L1TStage2EMTF.h b/DQM/L1TMonitor/interface/L1TStage2EMTF.h
@@ -19,7 +19,6 @@ class L1TStage2EMTF : public DQMEDAnalyzer {
   ~L1TStage2EMTF() override;
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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
@@ -19,7 +19,6 @@ class L1TStage2MuonComp : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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
@@ -41,7 +41,6 @@ class L1TStage2OMTF : public DQMEDAnalyzer {
   // member functions
 protected:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
   void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override;
 
   // data members

diff --git a/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h b/DQM/L1TMonitor/interface/L1TStage2RegionalMuonCandComp.h
@@ -19,7 +19,6 @@ class L1TStage2RegionalMuonCandComp : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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
@@ -21,7 +21,6 @@ class L1TStage2uGMT : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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
@@ -19,7 +19,6 @@ class L1TStage2uGMTMuon : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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/L1TdeCSCTF.h b/DQM/L1TMonitor/interface/L1TdeCSCTF.h
@@ -65,7 +65,6 @@ class L1TdeCSCTF : public DQMEDAnalyzer {
 protected:
   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;
 
 public:
   explicit L1TdeCSCTF(edm::ParameterSet const& pset);

diff --git a/DQM/L1TMonitor/interface/L1TdeGCT.h b/DQM/L1TMonitor/interface/L1TdeGCT.h
@@ -30,7 +30,6 @@ class L1TdeGCT : public DQMEDAnalyzer {
   ~L1TdeGCT() override;
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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;

diff --git a/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h b/DQM/L1TMonitor/interface/L1TdeStage2CaloLayer1.h
@@ -34,7 +34,6 @@ class L1TdeStage2CaloLayer1 : public DQMOneEDAnalyzer<edm::one::WatchLuminosityB
 protected:
   void analyze(const edm::Event &e, const edm::EventSetup &c) override;
   void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) override;
-  void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void beginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
   void endLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
 

diff --git a/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h b/DQM/L1TMonitor/interface/L1TdeStage2EMTF.h
@@ -16,7 +16,6 @@ class L1TdeStage2EMTF : public DQMEDAnalyzer {
   ~L1TdeStage2EMTF() override;
 
 protected:
-  void dqmBeginRun(const edm::Run&, 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
@@ -41,7 +41,6 @@ class L1TdeStage2uGT : public DQMEDAnalyzer {
 protected:
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
   void bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup&) override;
 
 private:
   // Input and config info

diff --git a/DQM/L1TMonitor/src/BxTiming.cc b/DQM/L1TMonitor/src/BxTiming.cc
@@ -259,8 +259,6 @@ void BxTiming::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm:
   }
 }
 
-void BxTiming::dqmBeginRun(edm::Run const &r, edm::EventSetup const &iSetup) {}
-
 // ------------ method called to for each event  ------------
 void BxTiming::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   if (verbose())

diff --git a/DQM/L1TMonitor/src/L1GtHwValidation.cc b/DQM/L1TMonitor/src/L1GtHwValidation.cc
@@ -143,8 +143,6 @@ L1GtHwValidation::~L1GtHwValidation() {
 
 // member functions
 
-void L1GtHwValidation::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& evSetup) {}
-
 void L1GtHwValidation::bookHistograms(DQMStore::IBooker& ibooker,
                                       const edm::Run& iRun,
                                       const edm::EventSetup& evSetup) {

diff --git a/DQM/L1TMonitor/src/L1TCSCTF.cc b/DQM/L1TMonitor/src/L1TCSCTF.cc
@@ -105,8 +105,6 @@ L1TCSCTF::~L1TCSCTF() {
         delete srLUTs_[i][j][s];  //free the array of pointers
 }
 
-void L1TCSCTF::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {}
-
 void L1TCSCTF::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::EventSetup const&) {
   m_scalesCacheID = -999;
   m_ptScaleCacheID = -999;

diff --git a/DQM/L1TMonitor/src/L1TCSCTPG.cc b/DQM/L1TMonitor/src/L1TCSCTPG.cc
@@ -45,8 +45,6 @@ void L1TCSCTPG::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun,
   csctpgbx = ibooker.book1D("CSC TPG bx", "CSC TPG bx", 20, -0.5, 19.5);
 }
 
-void L1TCSCTPG::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {}
-
 void L1TCSCTPG::analyze(const Event& e, const EventSetup& c) {
   nev_++;
   if (verbose_)

diff --git a/DQM/L1TMonitor/src/L1TDEMON.cc b/DQM/L1TMonitor/src/L1TDEMON.cc
@@ -258,8 +258,6 @@ void L1TDEMON::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::
     std::cout << "L1TDEMON::bookHistograms()  end.\n" << std::flush;
 }
 
-void L1TDEMON::dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) {}
-
 // ------------ method called to for each event  ------------
 void L1TDEMON::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   if (!hasRecord_)

diff --git a/DQM/L1TMonitor/src/L1TGCT.cc b/DQM/L1TMonitor/src/L1TGCT.cc
@@ -254,8 +254,6 @@ void L1TGCT::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const&, edm::Ev
   //}
 }
 
-void L1TGCT::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) {}
-
 void L1TGCT::analyze(const edm::Event& e, const edm::EventSetup& c) {
   nev_++;
   if (verbose_) {
-Original file line number
+Diff line change
@@ Expand Up @@
       //}
     }
-    void L1TGCT::dqmBeginRun(edm::Run const& iRrun, edm::EventSetup const& evSetup) {}
     void L1TGCT::analyze(const edm::Event& e, const edm::EventSetup& c) {
       nev_++;
       if (verbose_) {
@@ Expand Down @@