Merge pull request #29102 from Dr15Jones/globalHiGenCleaner

Make HiGenCleaner a global module
cms-sw · Mar 6, 2020 · bf16e65 · bf16e65
2 parents 6dcf685 + 96877c0
commit bf16e65
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/RecoHI/HiJetAlgos/interface/HiGenCleaner.h b/RecoHI/HiJetAlgos/interface/HiGenCleaner.h
@@ -24,7 +24,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 
@@ -38,21 +38,21 @@
 //
 
 template <class T2>
-class HiGenCleaner : public edm::EDProducer {
+class HiGenCleaner : public edm::global::EDProducer<> {
 public:
   typedef std::vector<T2> T2Collection;
   explicit HiGenCleaner(const edm::ParameterSet&);
   ~HiGenCleaner() override;
 
 private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
   // ----------member data ---------------------------
 
-  edm::EDGetTokenT<edm::View<T2> > jetSrc_;
-  double deltaR_;
-  double ptCut_;
-  bool makeNew_;
-  bool fillDummy_;
+  const edm::EDGetTokenT<edm::View<T2> > jetSrc_;
+  const double deltaR_;
+  const double ptCut_;
+  const bool makeNew_;
+  const bool fillDummy_;
 };
 
 #endif
diff --git a/RecoHI/HiJetAlgos/src/HiGenCleaner.cc b/RecoHI/HiJetAlgos/src/HiGenCleaner.cc
@@ -82,7 +82,7 @@ HiGenCleaner<T2>::~HiGenCleaner() {
 
 // ------------ method called to produce the data  ------------
 template <class T2>
-void HiGenCleaner<T2>::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void HiGenCleaner<T2>::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
   using namespace edm;
   using namespace reco;