Merge pull request #25589 from Dr15Jones/threadSafeEgammaHLTPixelMatc…

…hElectronProducers Fix thread safety of EgammaHLTPixelMatchElectronProducers
cms-sw · Jan 8, 2019 · dae2804 · dae2804
2 parents 36c07e8 + 9a5dab5
commit dae2804
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 29 deletions.
diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPixelMatchElectronProducers.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPixelMatchElectronProducers.h
@@ -8,37 +8,38 @@
 // $Id: EgammaHLTPixelMatchElectronProducers.h,v 1.3 2009/10/14 14:32:23 covarell Exp $
 
 
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Utilities/interface/EDPutToken.h"
 
+#include "RecoEgamma/EgammaHLTAlgos/interface/EgammaHLTPixelMatchElectronAlgo.h"
+
+#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <string>
+#include <memory>
 
 namespace edm {
   class ConfigurationDescriptions;
 }
 
 class EgammaHLTPixelMatchElectronAlgo;
 
-class EgammaHLTPixelMatchElectronProducers : public edm::global::EDProducer<> {
+class EgammaHLTPixelMatchElectronProducers : public edm::stream::EDProducer<> {
 
  public:
 
   explicit EgammaHLTPixelMatchElectronProducers(const edm::ParameterSet& conf);
-  ~EgammaHLTPixelMatchElectronProducers() override;
 
-  void produce(edm::StreamID sid, edm::Event& e, const edm::EventSetup& c) const override;
+  void produce(edm::Event& e, const edm::EventSetup& c) override;
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
  private:
 
-  const edm::ParameterSet conf_;
-
-  EgammaHLTPixelMatchElectronAlgo* algo_;
-  std::string  seedProducer_;
+  EgammaHLTPixelMatchElectronAlgo algo_;
+  const edm::EDPutTokenT<reco::ElectronCollection> token_;
 };
 #endif
diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPixelMatchElectronProducers.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTPixelMatchElectronProducers.cc
@@ -19,6 +19,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "RecoEgamma/EgammaHLTProducers/interface/EgammaHLTPixelMatchElectronProducers.h"
 
@@ -31,24 +32,16 @@
 
 using namespace reco;
 
-EgammaHLTPixelMatchElectronProducers::EgammaHLTPixelMatchElectronProducers(const edm::ParameterSet& iConfig) : conf_(iConfig) {
-
-  consumes<TrackCollection>(conf_.getParameter<edm::InputTag>("TrackProducer"));
-  consumes<GsfTrackCollection>(conf_.getParameter<edm::InputTag>("GsfTrackProducer"));
-  consumes<BeamSpot>(conf_.getParameter<edm::InputTag>("BSProducer"));
-
-  //create algo
-  algo_ = new EgammaHLTPixelMatchElectronAlgo(conf_, consumesCollector());
-
-  //register your products
-  produces<ElectronCollection>();
+EgammaHLTPixelMatchElectronProducers::EgammaHLTPixelMatchElectronProducers(const edm::ParameterSet& iConfig) : 
+  algo_(iConfig,consumesCollector()),
+  token_(  produces<ElectronCollection>() )
+{
+  consumes<TrackCollection>(iConfig.getParameter<edm::InputTag>("TrackProducer"));
+  consumes<GsfTrackCollection>(iConfig.getParameter<edm::InputTag>("GsfTrackProducer"));
+  consumes<BeamSpot>(iConfig.getParameter<edm::InputTag>("BSProducer"));
 }
 
 
-EgammaHLTPixelMatchElectronProducers::~EgammaHLTPixelMatchElectronProducers() {
-  delete algo_;
-}
-
 void EgammaHLTPixelMatchElectronProducers::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
 
   edm::ParameterSetDescription desc;
@@ -60,18 +53,18 @@ void EgammaHLTPixelMatchElectronProducers::fillDescriptions(edm::ConfigurationDe
 }
 
 // ------------ method called to produce the data  ------------
-void EgammaHLTPixelMatchElectronProducers::produce(edm::StreamID sid, edm::Event& e, const edm::EventSetup& iSetup) const {
+void EgammaHLTPixelMatchElectronProducers::produce(edm::Event& e, const edm::EventSetup& iSetup) {
   // Update the algorithm conditions
-  algo_->setupES(iSetup);  
+  algo_.setupES(iSetup);  
 
   // Create the output collections   
-  auto pOutEle = std::make_unique<ElectronCollection>();
+  ElectronCollection  outEle;
 
   // invoke algorithm
-    algo_->run(e,*pOutEle);
+    algo_.run(e,outEle);
 
   // put result into the Event
-    e.put(std::move(pOutEle));
+    e.emplace(token_,std::move(outEle));
 }