Merge pull request #14366 from thomaslenzi/from-CMSSW_8_1_THREADED_X_…

…2016-05-02-2300 Fixed clusterizer for Threaded version of CMSSW
cms-sw · May 6, 2016 · a6aa278 · a6aa278
2 parents 90d539f + 5ed3c05
commit a6aa278
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc b/RecoLocalTracker/SiPhase2Clusterizer/plugins/Phase2TrackerClusterizer.cc
@@ -1,4 +1,4 @@
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -24,12 +24,12 @@
 #include <vector>
 #include <memory>
 
-class Phase2TrackerClusterizer : public edm::global::EDProducer<> {
+class Phase2TrackerClusterizer : public edm::stream::EDProducer<> {
 
     public:
         explicit Phase2TrackerClusterizer(const edm::ParameterSet& conf);
         virtual ~Phase2TrackerClusterizer();
-        void produce(edm::StreamID sid, edm::Event& event, const edm::EventSetup& eventSetup) const override final;
+        virtual void produce(edm::Event& event, const edm::EventSetup& eventSetup) override;
 
     private:
         std::unique_ptr< Phase2TrackerClusterizerAlgorithm > clusterizer_;
@@ -54,7 +54,7 @@ class Phase2TrackerClusterizer : public edm::global::EDProducer<> {
      * Clusterize the events
      */
 
-    void Phase2TrackerClusterizer::produce(edm::StreamID sid, edm::Event& event, const edm::EventSetup& eventSetup) const {
+    void Phase2TrackerClusterizer::produce(edm::Event& event, const edm::EventSetup& eventSetup) {
 
         // Get the Digis
         edm::Handle< edm::DetSetVector< Phase2TrackerDigi > > digis;