From 69ddbb8688b484a5bba68fa9a74443d844877865 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Mon, 12 May 2014 16:43:16 +0200 Subject: [PATCH] Revert Tracking modules back to stream modules The static analyzer is reporting that the thread safety issues with the tracking modules has been fixed so we should be able to run these as stream modules. --- RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h | 4 ++-- RecoTracker/CkfPattern/interface/CkfTrajectoryMaker.h | 4 ++-- .../plugins/SeedGeneratorFromRegionHitsEDProducer.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h b/RecoTracker/CkfPattern/interface/CkfTrackCandidateMaker.h index 8337e040834bb..7ee8198c35dac 100644 --- 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 index 3e175161352a3..807c7bb861bc4 100644 --- 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 TrajectoryCollection; diff --git a/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.h b/RecoTracker/TkSeedGenerator/plugins/SeedGeneratorFromRegionHitsEDProducer.h index ac97b6878496f..eca4bd1892bd0 100644 --- 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);