Merge pull request #2945 from thomreis/dqmedanalyzer_migration

HLTriggerOffline/Egamma -- DQMEDAnalyzer migration
cms-sw · Mar 27, 2014 · 8f4573b · 8f4573b
2 parents b4906fb + c6bcb78
commit 8f4573b
Show file tree

Hide file tree

Showing 6 changed files with 249 additions and 251 deletions.
diff --git a/HLTriggerOffline/Egamma/interface/EmDQM.h b/HLTriggerOffline/Egamma/interface/EmDQM.h
@@ -15,6 +15,7 @@
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
@@ -59,7 +60,7 @@ class HistoFiller {
   EmDQM* dqm;
 };
 
-class EmDQM : public edm::EDAnalyzer{
+class EmDQM : public DQMEDAnalyzer{
 public:
 
   friend class HistoFiller<reco::ElectronCollection>;
@@ -78,12 +79,12 @@ class EmDQM : public edm::EDAnalyzer{
   void beginJob();
   void endJob();
 
-  void beginRun(edm::Run const&, edm::EventSetup const&);
+  void dqmBeginRun(edm::Run const&, edm::EventSetup const&);
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void endRun(edm::Run const&, edm::EventSetup const&);
 
 private:
   // interface to DQM framework
-  DQMStore * dbe;
   std::string dirname_;
 
   HistoFiller<reco::ElectronCollection>* histoFillerEle;

diff --git a/HLTriggerOffline/Egamma/interface/EmDQMReco.h b/HLTriggerOffline/Egamma/interface/EmDQMReco.h
@@ -13,6 +13,7 @@
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include <vector>
@@ -39,7 +40,7 @@ class HistoFillerReco {
   EmDQMReco* dqm;
 };
 
-class EmDQMReco : public edm::EDAnalyzer{
+class EmDQMReco : public DQMEDAnalyzer{
 
   //----------------------------------------
 
@@ -57,6 +58,7 @@ class EmDQMReco : public edm::EDAnalyzer{
      *   for the histogram TITLE where the first %s is replaced with et,eta or phi.
      */
     FourVectorMonitorElements(EmDQMReco *_parent,
+        DQMStore::IBooker &iBooker,
         const std::string &histogramNameTemplate,
         const std::string &histogramTitleTemplate);
 
@@ -91,7 +93,8 @@ class EmDQMReco : public edm::EDAnalyzer{
   void analyze(const edm::Event & event, const edm::EventSetup&);
   void beginJob();
   void endJob();
-  void beginRun( const edm::Run&, const edm::EventSetup& );
+  void dqmBeginRun( const edm::Run&, const edm::EventSetup& );
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
 private:
   // Input from cfg file
@@ -222,7 +225,6 @@ class EmDQMReco : public edm::EDAnalyzer{
   // int prescale;
 
   // interface to DQM framework
-  DQMStore * dbe;
   std::string dirname_;
 
   HistoFillerReco<reco::ElectronCollection>* histoFillerEle;