Merge pull request #3825 from Dr15Jones/revertTrackModuleToStream

Multithreading -- Revert Tracking modules back to stream modules
cms-sw · May 12, 2014 · 6b790fa · 6b790fa
2 parents 9bfd8ae + 69ddbb8
commit 6b790fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h b/RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h
@@ -1,7 +1,7 @@
 #ifndef CkfTrackCandidateMaker_h
 #define CkfTrackCandidateMaker_h
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -23,7 +23,7 @@ class TransientInitialStateEstimator;
 
 namespace cms
 {
-  class CkfTrackCandidateMaker : public edm::EDProducer, public CkfTrackCandidateMakerBase
+  class CkfTrackCandidateMaker : public edm::stream::EDProducer<>, public CkfTrackCandidateMakerBase
   {
   public:
 

diff --git a/RecoTracker/CkfPattern/interface/CkfTrajectoryMaker.h b/RecoTracker/CkfPattern/interface/CkfTrajectoryMaker.h
@@ -1,7 +1,7 @@
 #ifndef CkfTrajectoryMaker_h
 #define CkfTrajectoryMaker_h
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -23,7 +23,7 @@ class TransientInitialStateEstimator;
 
 namespace cms
 {
-  class CkfTrajectoryMaker : public edm::EDProducer, public CkfTrackCandidateMakerBase
+  class CkfTrajectoryMaker : public edm::stream::EDProducer<>, public CkfTrackCandidateMakerBase
   {
   public:
     typedef std::vector<Trajectory> TrajectoryCollection;

diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.h b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.h
@@ -1,7 +1,7 @@
 #ifndef RecoTracker_TkSeedGenerator_SeedGeneratorFromRegionHitsEDProducer_H
 #define RecoTracker_TkSeedGenerator_SeedGeneratorFromRegionHitsEDProducer_H
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "RecoTracker/SpecialSeedGenerators/interface/ClusterChecker.h"
 
@@ -11,7 +11,7 @@ class SeedGeneratorFromRegionHits;
 class TrackingRegionProducer;
 class QuadrupletSeedMerger;
 
-class SeedGeneratorFromRegionHitsEDProducer : public edm::EDProducer {
+class SeedGeneratorFromRegionHitsEDProducer : public edm::stream::EDProducer<> {
 public:
 
   SeedGeneratorFromRegionHitsEDProducer(const edm::ParameterSet& cfg);