Merge pull request #36359 from Dr15Jones/modernizePhysicsToolsHepMCCa…

…ndAlgos Modernized module in PhysicsTools/HepMCCandAlgos
cms-sw · Dec 15, 2021 · 69748ea · 69748ea
2 parents 521d94e + 967b8d9
commit 69748ea
Show file tree

Hide file tree

Showing 18 changed files with 366 additions and 393 deletions.
diff --git a/CommonTools/UtilAlgos/interface/CollectionAdder.h b/CommonTools/UtilAlgos/interface/CollectionAdder.h
@@ -6,15 +6,15 @@
  *
  * \version $Id: CollectionAdder.h,v 1.3 2010/02/20 20:55:17 wmtan Exp $
  */
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/transform.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 
 template <typename C>
-class CollectionAdder : public edm::EDProducer {
+class CollectionAdder : public edm::global::EDProducer<> {
 public:
   typedef C collection;
   CollectionAdder(const edm::ParameterSet& cfg)
@@ -25,7 +25,7 @@ class CollectionAdder : public edm::EDProducer {
 
 private:
   std::vector<edm::EDGetTokenT<collection>> srcTokens_;
-  void produce(edm::Event& evt, const edm::EventSetup&) override {
+  void produce(edm::StreamID, edm::Event& evt, const edm::EventSetup&) const override {
     std::unique_ptr<collection> coll(new collection);
     typename collection::Filler filler(*coll);
     for (size_t i = 0; i < srcTokens_.size(); ++i) {

diff --git a/CommonTools/UtilAlgos/interface/Matcher.h b/CommonTools/UtilAlgos/interface/Matcher.h
@@ -5,7 +5,7 @@
  * \author Luca Lista, INFN
  *
  */
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "CommonTools/UtilAlgos/interface/DeltaR.h"
@@ -18,7 +18,7 @@
 namespace reco {
   namespace modules {
     template <typename C1, typename C2, typename M = edm::AssociationMap<edm::OneToOne<C1, C2> > >
-    class MatcherBase : public edm::EDProducer {
+    class MatcherBase : public edm::global::EDProducer<> {
     public:
       MatcherBase(const edm::ParameterSet&);
       ~MatcherBase() override;
@@ -29,7 +29,7 @@ namespace reco {
       typedef M MatchMap;
 
     private:
-      void produce(edm::Event&, const edm::EventSetup&) override;
+      void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
       edm::EDGetTokenT<C1> srcToken_;
       edm::EDGetTokenT<C2> matchedToken_;
       double distMin_;
@@ -79,7 +79,7 @@ namespace reco {
     MatcherBase<C1, C2, M>::~MatcherBase() {}
 
     template <typename C1, typename C2, typename M>
-    void MatcherBase<C1, C2, M>::produce(edm::Event& evt, const edm::EventSetup&) {
+    void MatcherBase<C1, C2, M>::produce(edm::StreamID, edm::Event& evt, const edm::EventSetup&) const {
       using namespace edm;
       using namespace std;
       Handle<C2> matched;

diff --git a/CommonTools/UtilAlgos/interface/NewMatcher.h b/CommonTools/UtilAlgos/interface/NewMatcher.h
@@ -5,7 +5,7 @@
  * \author Luca Lista, INFN
  *
  */
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "CommonTools/UtilAlgos/interface/DeltaR.h"
@@ -20,7 +20,7 @@ namespace reco {
   namespace modulesNew {
 
     template <typename C1, typename C2, typename S, typename D = DeltaR<typename C1::value_type, typename C2::value_type> >
-    class Matcher : public edm::EDProducer {
+    class Matcher : public edm::global::EDProducer<> {
     public:
       Matcher(const edm::ParameterSet& cfg);
       ~Matcher() override;
@@ -29,7 +29,7 @@ namespace reco {
       typedef typename C1::value_type T1;
       typedef typename C2::value_type T2;
       typedef edm::Association<C2> MatchMap;
-      void produce(edm::Event&, const edm::EventSetup&) override;
+      void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
       edm::EDGetTokenT<C1> srcToken_;
       edm::EDGetTokenT<C2> matchedToken_;
       double distMin_;
@@ -61,7 +61,7 @@ namespace reco {
     Matcher<C1, C2, S, D>::~Matcher() {}
 
     template <typename C1, typename C2, typename S, typename D>
-    void Matcher<C1, C2, S, D>::produce(edm::Event& evt, const edm::EventSetup&) {
+    void Matcher<C1, C2, S, D>::produce(edm::StreamID, edm::Event& evt, const edm::EventSetup&) const {
       using namespace edm;
       using namespace std;
       Handle<C2> matched;

diff --git a/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryFilter.h b/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryFilter.h
diff --git a/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryProducer.h b/PhysicsTools/HepMCCandAlgos/interface/FlavorHistoryProducer.h
diff --git a/PhysicsTools/HepMCCandAlgos/interface/HFFilter.h b/PhysicsTools/HepMCCandAlgos/interface/HFFilter.h
diff --git a/PhysicsTools/HepMCCandAlgos/interface/ModelFilter.h b/PhysicsTools/HepMCCandAlgos/interface/ModelFilter.h