Merge pull request #11351 from fwyzard/multithreading_74x_EgammaHLT

multithreading fix for 74x: E/Gamma HLT modules
cms-sw · Oct 9, 2015 · b5f9902 · b5f9902
2 parents ccdae08 + 5d68dc2
commit b5f9902
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/HLTrigger/special/interface/HLTRegionalEcalResonanceFilter.h b/HLTrigger/special/interface/HLTRegionalEcalResonanceFilter.h
@@ -15,7 +15,7 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration.
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -71,7 +71,8 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class HLTRegionalEcalResonanceFilter : public edm::EDFilter {
+class HLTRegionalEcalResonanceFilter : public edm::stream::EDFilter<> 
+{
    public:
       explicit HLTRegionalEcalResonanceFilter(const edm::ParameterSet&);
       ~HLTRegionalEcalResonanceFilter();

diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTNxNClusterProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTNxNClusterProducer.h
@@ -10,7 +10,7 @@ Description: simple NxN ( 3x3 etc) clustering ,( for low energy photon reconstru
 */
 
 #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"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -44,7 +44,7 @@ class ecalRecHitSort : public std::binary_function<EcalRecHit, EcalRecHit, bool>
 };
 
 
-class EgammaHLTNxNClusterProducer : public edm::EDProducer {
+class EgammaHLTNxNClusterProducer : public edm::stream::EDProducer<> {
  public:
 
   EgammaHLTNxNClusterProducer(const edm::ParameterSet& ps);