Finished begin/end/Run/LuminosityBlock API change by making all modul…

…es which put data into Run or LuminosityBlock inherit from the new framework module base classes edm::one::EDProducer<> or edm::one::EDFilter<>
abdoulline · May 17, 2013 · b066bc4 · b066bc4
1 parent cc769be
commit b066bc4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Validation/GlobalHits/interface/GlobalHitsProdHist.h b/Validation/GlobalHits/interface/GlobalHitsProdHist.h
@@ -5,13 +5,13 @@
  *  
  *  Class to fill dqm monitor elements from existing EDM file
  *
- *  $Date: 2012/09/04 20:38:33 $
- *  $Revision: 1.8 $
+ *  $Date: 2013/02/27 13:28:59 $
+ *  $Revision: 1.9 $
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Run.h"
@@ -73,7 +73,7 @@
 #include "TString.h"
 #include "TH1F.h"
 
-class GlobalHitsProdHist : public edm::EDProducer
+class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer>
 {
 
  public:
@@ -82,10 +82,10 @@ class GlobalHitsProdHist : public edm::EDProducer
 
   explicit GlobalHitsProdHist(const edm::ParameterSet&);
   virtual ~GlobalHitsProdHist();
-  virtual void beginJob( void );
-  virtual void endJob();  
+  virtual void beginJob() override;
+  virtual void endJob() override;  
   virtual void produce(edm::Event&, const edm::EventSetup&) override;
-  virtual void endRun(edm::Run&, const edm::EventSetup&) override;
+  virtual void endRunProduce(edm::Run&, const edm::EventSetup&) override;
 
  private:
 

diff --git a/Validation/GlobalHits/src/GlobalHitsProdHist.cc b/Validation/GlobalHits/src/GlobalHitsProdHist.cc
@@ -2,8 +2,8 @@
  *  
  *  See header file for description of class
  *
- *  $Date: 2010/01/06 14:24:50 $
- *  $Revision: 1.5 $
+ *  $Date: 2012/09/04 20:38:34 $
+ *  $Revision: 1.6 $
  *  \author M. Strang SUNY-Buffalo
  */
 
@@ -616,7 +616,7 @@ GlobalHitsProdHist::~GlobalHitsProdHist()
 {
 }
 
-void GlobalHitsProdHist::beginJob( void )
+void GlobalHitsProdHist::beginJob()
 {
   return;
 }
@@ -706,7 +706,7 @@ void GlobalHitsProdHist::produce(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProdHist::endRun(edm::Run& iRun, const edm::EventSetup& iSetup)
+void GlobalHitsProdHist::endRunProduce(edm::Run& iRun, const edm::EventSetup& iSetup)
 {
 
   std::string MsgLoggerCat = "GlobalHitsProdHist_endRun";