Make CandMatcher and NewCandMatcher aliases and not derived classes

cms-sw · Sep 14, 2021 · f076690 · f076690
1 parent d62d750
commit f076690
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/CommonTools/CandAlgos/interface/CandMatcher.h b/CommonTools/CandAlgos/interface/CandMatcher.h
@@ -9,17 +9,8 @@
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "CommonTools/CandUtils/interface/CandMapTrait.h"
 
-namespace reco {
-  namespace modules {
-    template <typename S, typename Collection = CandidateCollection, typename D = DeltaR<reco::Candidate> >
-    class CandMatcher
-        : public Matcher<Collection, Collection, S, D, typename reco::helper::CandMapTrait<Collection>::type> {
-    public:
-      CandMatcher(const edm::ParameterSet& cfg)
-          : Matcher<Collection, Collection, S, D, typename reco::helper::CandMapTrait<Collection>::type>(cfg) {}
-      ~CandMatcher() override {}
-    };
-
-  }  // namespace modules
-}  // namespace reco
+namespace reco::modules {
+  template <typename S, typename Collection = CandidateCollection, typename D = DeltaR<reco::Candidate> >
+  using CandMatcher = Matcher<Collection, Collection, S, D, typename reco::helper::CandMapTrait<Collection>::type>;
+}  // namespace reco::modules
 #endif
diff --git a/CommonTools/CandAlgos/interface/NewCandMatcher.h b/CommonTools/CandAlgos/interface/NewCandMatcher.h
@@ -8,15 +8,8 @@
 #include "CommonTools/UtilAlgos/interface/NewMatcher.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 
-namespace reco {
-  namespace modulesNew {
-    template <typename S, typename C1, typename C2, typename D = DeltaR<reco::Candidate> >
-    class CandMatcher : public Matcher<C1, C2, S, D> {
-    public:
-      CandMatcher(const edm::ParameterSet& cfg) : Matcher<C1, C2, S, D>(cfg) {}
-      ~CandMatcher() override {}
-    };
-
-  }  // namespace modulesNew
-}  // namespace reco
+namespace reco::modulesNew {
+  template <typename S, typename C1, typename C2, typename D = DeltaR<reco::Candidate> >
+  using CandMatcher = Matcher<C1, C2, S, D>;
+}  // namespace reco::modulesNew
 #endif