multi-threading support added

cms-sw · May 12, 2015 · 790edb2 · 790edb2
1 parent e598187
commit 790edb2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/RecoEcal/EgammaClusterProducers/interface/IslandClusterProducer.h b/RecoEcal/EgammaClusterProducers/interface/IslandClusterProducer.h
@@ -5,7 +5,7 @@
 #include <time.h>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
@@ -24,15 +24,15 @@
 //
 
 
-class IslandClusterProducer : public edm::EDProducer 
+class IslandClusterProducer : public edm::stream::EDProducer<> 
 {
   public:
 
       IslandClusterProducer(const edm::ParameterSet& ps);
 
       ~IslandClusterProducer();
 
-      virtual void produce(edm::Event&, const edm::EventSetup&);
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
    private:
 

diff --git a/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.h b/RecoHI/HiEgammaAlgos/plugins/HiEgammaSCCorrectionMaker.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -37,12 +37,12 @@
 #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
 
 
-class HiEgammaSCCorrectionMaker : public edm::EDProducer {
+class HiEgammaSCCorrectionMaker : public edm::stream::EDProducer<> {
 
    public:
      explicit HiEgammaSCCorrectionMaker(const edm::ParameterSet&);
      ~HiEgammaSCCorrectionMaker();
-     virtual void produce(edm::Event&, const edm::EventSetup&);
+     virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
    private:
 

diff --git a/RecoHI/HiEgammaAlgos/plugins/HiSpikeCleaner.cc b/RecoHI/HiEgammaAlgos/plugins/HiSpikeCleaner.cc
@@ -22,7 +22,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 
@@ -46,15 +46,14 @@
 // class declaration
 //
 
-class HiSpikeCleaner : public edm::EDProducer {
+class HiSpikeCleaner : public edm::stream::EDProducer<> {
 public:
   explicit HiSpikeCleaner(const edm::ParameterSet&);
   ~HiSpikeCleaner();
 
 private:
-  virtual void beginJob() override ;
+
   virtual void produce(edm::Event&, const edm::EventSetup&) override;
-  virtual void endJob() override ;
 
   // ----------member data ---------------------------
 
@@ -210,16 +209,5 @@ HiSpikeCleaner::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
 
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-HiSpikeCleaner::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-HiSpikeCleaner::endJob() {
-}
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(HiSpikeCleaner);
diff --git a/RecoHI/HiEgammaAlgos/plugins/HiSuperClusterProducer.h b/RecoHI/HiEgammaAlgos/plugins/HiSuperClusterProducer.h
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
@@ -17,7 +17,7 @@
 //
 
 
-class HiSuperClusterProducer : public edm::EDProducer 
+class HiSuperClusterProducer : public edm::stream::EDProducer<> 
 {
 
   public:
@@ -26,7 +26,7 @@ class HiSuperClusterProducer : public edm::EDProducer
 
       ~HiSuperClusterProducer();
 
-      virtual void produce(edm::Event&, const edm::EventSetup&);
+      virtual void produce(edm::Event&, const edm::EventSetup&) override;
       virtual void endJob();
 
    private: