cms-sw · cmsbuild · Mar 3, 2020 · Jan 28, 2020 · Jan 28, 2020 · Jan 30, 2020
diff --git a/Calibration/EcalCalibAlgos/interface/ECALpedestalPCLworker.h b/Calibration/EcalCalibAlgos/interface/ECALpedestalPCLworker.h
@@ -37,10 +37,8 @@ class ECALpedestalPCLworker : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
-  void beginJob() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void analyze(const edm::Event &, const edm::EventSetup &) override;
-  void endJob() override;
 
   edm::EDGetTokenT<EBDigiCollection> digiTokenEB_;
   edm::EDGetTokenT<EEDigiCollection> digiTokenEE_;

diff --git a/Calibration/EcalCalibAlgos/src/ECALpedestalPCLworker.cc b/Calibration/EcalCalibAlgos/src/ECALpedestalPCLworker.cc
@@ -96,10 +96,6 @@ void ECALpedestalPCLworker::analyze(const edm::Event& iEvent, const edm::EventSe
   }  // ee digis
 }
 
-void ECALpedestalPCLworker::beginJob() {}
-
-void ECALpedestalPCLworker::endJob() {}
-
 void ECALpedestalPCLworker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.setUnknown();

diff --git a/DQM/CSCMonitorModule/plugins/CSCMonitorModule.h b/DQM/CSCMonitorModule/plugins/CSCMonitorModule.h
@@ -27,11 +27,9 @@
 #include <set>
 
 /// DQM Framework stuff
-#include <FWCore/Framework/interface/EDAnalyzer.h>
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 
-#include <DQMServices/Core/interface/DQMStore.h>
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
+#include <DQMServices/Core/interface/DQMOneEDAnalyzer.h>
 
 #include <FWCore/ServiceRegistry/interface/Service.h>
 #include <FWCore/Framework/interface/ESHandle.h>
@@ -72,7 +70,7 @@ static const unsigned int MAX_DMB_SLOT = 10;
  * @class CSCMonitorModule
  * @brief Common CSC DQM Module that uses CSCDQM Framework  
  */
-class CSCMonitorModule : public DQMEDAnalyzer, public cscdqm::MonitorObjectProvider {
+class CSCMonitorModule : public DQMOneEDAnalyzer<>, public cscdqm::MonitorObjectProvider {
   /**
    * Global stuff
    */

diff --git a/DQM/EcalPreshowerMonitorModule/interface/ESFEDIntegrityTask.h b/DQM/EcalPreshowerMonitorModule/interface/ESFEDIntegrityTask.h
@@ -22,8 +22,6 @@ class ESFEDIntegrityTask : public DQMEDAnalyzer {
   /// Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  void endJob() override;
-
 private:
   int ievt_;
 

diff --git a/DQM/EcalPreshowerMonitorModule/interface/ESOccupancyTask.h b/DQM/EcalPreshowerMonitorModule/interface/ESOccupancyTask.h
@@ -1,16 +1,13 @@
 #ifndef ESOccupancyTask_H
 #define ESOccupancyTask_H
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-
-class ESOccupancyTask : public DQMEDAnalyzer {
+class ESOccupancyTask : public DQMOneEDAnalyzer<> {
 public:
   ESOccupancyTask(const edm::ParameterSet& ps);
   ~ESOccupancyTask() override {}

diff --git a/DQM/EcalPreshowerMonitorModule/interface/ESPedestalTask.h b/DQM/EcalPreshowerMonitorModule/interface/ESPedestalTask.h
@@ -18,7 +18,6 @@ class ESPedestalTask : public DQMEDAnalyzer {
 private:
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob(void) override;
 
   edm::EDGetTokenT<ESDigiCollection> digitoken_;
   edm::FileInPath lookup_;

diff --git a/DQM/EcalPreshowerMonitorModule/interface/ESRawDataTask.h b/DQM/EcalPreshowerMonitorModule/interface/ESRawDataTask.h
@@ -20,9 +20,6 @@ class ESRawDataTask : public DQMEDAnalyzer {
   /// Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  /// EndJob
-  void endJob(void) override;
-
   /// Setup
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
 

diff --git a/DQM/EcalPreshowerMonitorModule/interface/ESTrendTask.h b/DQM/EcalPreshowerMonitorModule/interface/ESTrendTask.h
@@ -27,9 +27,6 @@ class ESTrendTask : public DQMEDAnalyzer {
   // Analyze
   void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  // EndJob
-  void endJob(void) override;
-
   // BeginRun
   void dqmBeginRun(const edm::Run& r, const edm::EventSetup& c) override;
 

diff --git a/DQM/EcalPreshowerMonitorModule/src/ESFEDIntegrityTask.cc b/DQM/EcalPreshowerMonitorModule/src/ESFEDIntegrityTask.cc
@@ -52,8 +52,6 @@ void ESFEDIntegrityTask::bookHistograms(DQMStore::IBooker& iBooker, Run const&,
   meESFedsNonFatal_ = iBooker.book1D(histo, histo, 56, 520, 576);
 }
 
-void ESFEDIntegrityTask::endJob(void) { LogInfo("ESFEDIntegrityTask") << "analyzed " << ievt_ << " events"; }
-
 void ESFEDIntegrityTask::analyze(const Event& e, const EventSetup& c) {
   ievt_++;
 

diff --git a/DQM/EcalPreshowerMonitorModule/src/ESPedestalTask.cc b/DQM/EcalPreshowerMonitorModule/src/ESPedestalTask.cc
@@ -72,8 +72,6 @@ void ESPedestalTask::bookHistograms(DQMStore::IBooker& iBooker, Run const&, Even
   }
 }
 
-void ESPedestalTask::endJob(void) { LogInfo("ESPedestalTask") << "analyzed " << ievt_ << " events"; }
-
 void ESPedestalTask::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   ievt_++;
   runNum_ = e.id().run();

diff --git a/DQM/EcalPreshowerMonitorModule/src/ESRawDataTask.cc b/DQM/EcalPreshowerMonitorModule/src/ESRawDataTask.cc
@@ -75,8 +75,6 @@ void ESRawDataTask::bookHistograms(DQMStore::IBooker& iBooker, Run const&, Event
   meOrbitNumberDiff_->setAxisTitle("Num of Events", 2);
 }
 
-void ESRawDataTask::endJob(void) { LogInfo("ESRawDataTask") << "analyzed " << ievt_ << " events"; }
-
 void ESRawDataTask::analyze(const Event& e, const EventSetup& c) {
   ievt_++;
   runNum_ = e.id().run();

diff --git a/DQM/EcalPreshowerMonitorModule/src/ESTrendTask.cc b/DQM/EcalPreshowerMonitorModule/src/ESTrendTask.cc
@@ -88,8 +88,6 @@ void ESTrendTask::bookHistograms(DQMStore::IBooker& iBooker, Run const&, EventSe
   hESFiberErrTrendHr_->setAxisTitle("ES Fiber Err / hour", 2);
 }
 
-void ESTrendTask::endJob(void) { LogInfo("ESTrendTask") << "analyzed " << ievt_ << " events"; }
-
 void ESTrendTask::analyze(const Event& e, const EventSetup& c) {
   ievt_++;
 

diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM.h b/DQM/Physics/src/SingleTopTChannelLeptonDQM.h
@@ -4,8 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "FWCore/Framework/interface/Event.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DQM/Physics/interface/TopDQMHelpers.h"
@@ -241,7 +240,6 @@ namespace SingleTopTChannelLepton {
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 /**
    \class   SingleTopTChannelLeptonDQM SingleTopTChannelLeptonDQM.h
@@ -277,7 +275,7 @@ namespace SingleTopTChannelLepton {
 /// define MonitorEnsembple to be used
 // using SingleTopTChannelLepton::MonitorEnsemble;
 
-class SingleTopTChannelLeptonDQM : public DQMEDAnalyzer {
+class SingleTopTChannelLeptonDQM : public DQMOneEDAnalyzer<> {
 public:
   /// default constructor
   SingleTopTChannelLeptonDQM(const edm::ParameterSet& cfg);

diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.h
@@ -1,11 +1,10 @@
 #ifndef SINGLETOPTCHANNELLEPTONDQM_MINIAOD
 #define SINGLETOPTCHANNELLEPTONDQM_MINIAOD
 
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include <string>
 #include <vector>
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DQM/Physics/interface/TopDQMHelpers.h"
@@ -182,9 +181,8 @@ namespace SingleTopTChannelLepton_miniAOD {
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class SingleTopTChannelLeptonDQM_miniAOD : public DQMEDAnalyzer {
+class SingleTopTChannelLeptonDQM_miniAOD : public DQMOneEDAnalyzer<> {
 public:
   /// default constructor
   SingleTopTChannelLeptonDQM_miniAOD(const edm::ParameterSet& cfg);

diff --git a/DQM/Physics/src/TopDiLeptonOfflineDQM.h b/DQM/Physics/src/TopDiLeptonOfflineDQM.h
@@ -1,12 +1,11 @@
 #ifndef TOPDILEPTONOFFLINEDQM
 #define TOPDILEPTONOFFLINEDQM
 
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
+
 #include <string>
 #include <vector>
 
-#include "FWCore/Framework/interface/Event.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-
 #include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DQM/Physics/interface/TopDQMHelpers.h"
@@ -253,7 +252,6 @@ namespace TopDiLeptonOffline {
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 /**
    \class   TopDiLeptonOfflineDQM TopDiLeptonOfflineDQM.h
@@ -295,7 +293,7 @@ namespace TopDiLeptonOffline {
 /// define MonitorEnsembple to be used
 // using TopDiLeptonOffline::MonitorEnsemble;
 
-class TopDiLeptonOfflineDQM : public DQMEDAnalyzer {
+class TopDiLeptonOfflineDQM : public DQMOneEDAnalyzer<> {
 public:
   /// default constructor
   TopDiLeptonOfflineDQM(const edm::ParameterSet& cfg);

diff --git a/DQM/Physics/src/TopSingleLeptonDQM.h b/DQM/Physics/src/TopSingleLeptonDQM.h
@@ -1,12 +1,10 @@
 #ifndef TOPSINGLELEPTONDQM
 #define TOPSINGLELEPTONDQM
 
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include <string>
 #include <vector>
 
-#include "FWCore/Framework/interface/Event.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DQM/Physics/interface/TopDQMHelpers.h"
 #include "DataFormats/Common/interface/ValueMap.h"
@@ -223,7 +221,6 @@ namespace TopSingleLepton {
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 /**
    \class   TopSingleLeptonDQM TopSingleLeptonDQM.h
@@ -266,7 +263,7 @@ namespace TopSingleLepton {
 /// define MonitorEnsembple to be used
 // using TopSingleLepton::MonitorEnsemble;
 
-class TopSingleLeptonDQM : public DQMEDAnalyzer {
+class TopSingleLeptonDQM : public DQMOneEDAnalyzer<> {
 public:
   /// default constructor
   TopSingleLeptonDQM(const edm::ParameterSet& cfg);

diff --git a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.h
@@ -1,11 +1,10 @@
 #ifndef TOPSINGLELEPTONDQM_MINIAOD
 #define TOPSINGLELEPTONDQM_MINIAOD
 
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include <string>
 #include <vector>
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DQM/Physics/interface/TopDQMHelpers.h"
@@ -182,9 +181,8 @@ namespace TopSingleLepton_miniAOD {
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class TopSingleLeptonDQM_miniAOD : public DQMEDAnalyzer {
+class TopSingleLeptonDQM_miniAOD : public DQMOneEDAnalyzer<> {
 public:
   /// default constructor
   TopSingleLeptonDQM_miniAOD(const edm::ParameterSet& cfg);

diff --git a/DQM/SiStripCommon/test/plugins/testTkHistoMap.cc b/DQM/SiStripCommon/test/plugins/testTkHistoMap.cc
@@ -5,7 +5,7 @@
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -35,7 +35,7 @@
 // class declaration
 //
 
-class testTkHistoMap : public DQMEDAnalyzer {
+class testTkHistoMap : public DQMOneEDAnalyzer<> {
 public:
   explicit testTkHistoMap(const edm::ParameterSet&);
   ~testTkHistoMap();

diff --git a/DQM/TrackingMonitor/interface/LogMessageMonitor.h b/DQM/TrackingMonitor/interface/LogMessageMonitor.h
@@ -20,10 +20,10 @@
 #include <memory>
 
 // user include files
+#include "DQMServices/Core/interface/DQMOneEDAnalyzer.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -32,11 +32,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/MessageLogger/interface/ErrorSummaryEntry.h"
 
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
-
 #include <vector>
 #include <string>
 #include <map>
@@ -49,7 +46,7 @@ class GetLumi;
 // class declaration
 //
 
-class LogMessageMonitor : public DQMEDAnalyzer {
+class LogMessageMonitor : public DQMOneEDAnalyzer<> {
 public:
   explicit LogMessageMonitor(const edm::ParameterSet&);
   ~LogMessageMonitor() override;

diff --git a/DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h b/DQM/TrackingMonitor/interface/TrackEfficiencyMonitor.h
@@ -43,8 +43,6 @@ class TrackEfficiencyMonitor : public DQMEDAnalyzer {
   typedef reco::TrackCollection TrackCollection;
   explicit TrackEfficiencyMonitor(const edm::ParameterSet&);
   ~TrackEfficiencyMonitor() override;
-  void beginJob(void) override;
-  void endJob(void) override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;

diff --git a/DQM/TrackingMonitor/interface/dEdxAnalyzer.h b/DQM/TrackingMonitor/interface/dEdxAnalyzer.h
@@ -39,7 +39,6 @@ class dEdxAnalyzer : public DQMEDAnalyzer {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
-  void endJob() override;
   double mass(double P, double I);
 
   void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;

diff --git a/DQM/TrackingMonitor/src/TrackEfficiencyMonitor.cc b/DQM/TrackingMonitor/src/TrackEfficiencyMonitor.cc
@@ -272,11 +272,6 @@ void TrackEfficiencyMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   StandaloneMuonPtEtaPhiHighPt->setAxisTitle("");
 }
 
-//-----------------------------------------------------------------------------------
-void TrackEfficiencyMonitor::beginJob(void)
-//-----------------------------------------------------------------------------------
-{}
-
 //-----------------------------------------------------------------------------------
 void TrackEfficiencyMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
 //-----------------------------------------------------------------------------------
@@ -366,19 +361,6 @@ void TrackEfficiencyMonitor::analyze(const edm::Event& iEvent, const edm::EventS
   delete theNavigation;
 }
 
-//-----------------------------------------------------------------------------------
-void TrackEfficiencyMonitor::endJob(void)
-//-----------------------------------------------------------------------------------
-{
-  bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
-  std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
-  if (outputMEsInRootFile) {
-    dqmStore_->save(outputFileName);
-  }
-
-  //if ( theNavigation ) delete theNavigation;
-}
-
 //-----------------------------------------------------------------------------------
 void TrackEfficiencyMonitor::testTrackerTracks(edm::Handle<reco::TrackCollection> tkTracks,
                                                edm::Handle<reco::TrackCollection> staTracks,

diff --git a/DQM/TrackingMonitor/src/dEdxAnalyzer.cc b/DQM/TrackingMonitor/src/dEdxAnalyzer.cc
@@ -41,15 +41,6 @@ dEdxAnalyzer::~dEdxAnalyzer() {
     delete genTriggerEventFlag_;
 }
 
-// ------------ method called once each job just after ending the event loop  ------------
-void dEdxAnalyzer::endJob() {
-  bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
-  std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
-  if (outputMEsInRootFile) {
-    dqmStore_->save(outputFileName);
-  }
-}
-
 /*
 // -- BeginRun
 //---------------------------------------------------------------------------------//

diff --git a/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h b/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h
@@ -44,8 +44,6 @@ class CaloTowersAnalyzer : public DQMEDAnalyzer {
   ~CaloTowersAnalyzer() override;
 
   void analyze(edm::Event const &, edm::EventSetup const &) override;
-  void beginJob() override;
-  void endJob() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;