Merge pull request #35703 from guitargeek/GsfTools_1

Merge .h files with .icc files in `TrackingTools/GsfTools/plugins`
cms-sw · Oct 19, 2021 · 3bf0da7 · 3bf0da7
2 parents fd8dd86 + e713737
commit 3bf0da7
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 93 deletions.
diff --git a/...ugins/CloseComponentsMergerESProducer.icc → ...lugins/CloseComponentsMergerESProducer.cc b/...ugins/CloseComponentsMergerESProducer.icc → ...lugins/CloseComponentsMergerESProducer.cc
@@ -1,19 +1,37 @@
-#include "TrackingTools/GsfTools/interface/CloseComponentsMerger.h"
-#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
-
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "TrackingTools/GsfTools/interface/CloseComponentsMerger.h"
+#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 
-#include <iostream>
+/** Provides the "CloseComponents" algorithm ("Merger") for reducing 
+ * the number of components in a multi-
+ */
 
-// #include "TrackingTools/GsfTools/interface/MultiGaussianState.h"
-// #include "TrackingTools/GsfTools/interface/SingleGaussianState.h"
-// #include "TrackingTools/GsfTools/interface/SingleGaussianState.h"
+template <unsigned int N>
+class CloseComponentsMergerESProducer : public edm::ESProducer {
+public:
+  CloseComponentsMergerESProducer(const edm::ParameterSet& p);
+  ~CloseComponentsMergerESProducer() override;
+  std::unique_ptr<MultiGaussianStateMerger<N> > produce(const TrackingComponentsRecord&);
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  const int maxComp_;
+  const edm::ESGetToken<DistanceBetweenComponents<N>, TrackingComponentsRecord> distToken_;
+};
+
+#include "FWCore/Framework/interface/ModuleFactory.h"
+typedef CloseComponentsMergerESProducer<5> CloseComponentsMergerESProducer5D;
+DEFINE_FWK_EVENTSETUP_MODULE(CloseComponentsMergerESProducer5D);
 
 template <unsigned int N>
 CloseComponentsMergerESProducer<N>::CloseComponentsMergerESProducer(const edm::ParameterSet& p)

diff --git a/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.h b/TrackingTools/GsfTools/plugins/CloseComponentsMergerESProducer.h
diff --git a/...s/DistanceBetweenComponentsESProducer.icc → ...ns/DistanceBetweenComponentsESProducer.cc b/...s/DistanceBetweenComponentsESProducer.icc → ...ns/DistanceBetweenComponentsESProducer.cc
@@ -1,15 +1,35 @@
-#include "TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h"
-
-#include "TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h"
-// #include "TrackingTools/GsfTools/interface/MahalanobisDistance.h"
-
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
+#include "TrackingTools/GsfTools/interface/KullbackLeiblerDistance.h"
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
-#include <string>
 #include <memory>
+#include <string>
+
+/** Provides algorithms to measure the distance between  components
+ * (currently either using a Kullback-Leibler or a Mahalanobis distance)
+ */
+
+template <unsigned int N>
+class DistanceBetweenComponentsESProducer : public edm::ESProducer {
+public:
+  DistanceBetweenComponentsESProducer(const edm::ParameterSet& p);
+
+  std::unique_ptr<DistanceBetweenComponents<N> > produce(const TrackingComponentsRecord&);
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  const bool useKullbackLeibler_;
+};
+
+#include "FWCore/Framework/interface/ModuleFactory.h"
+typedef DistanceBetweenComponentsESProducer<5> DistanceBetweenComponentsESProducer5D;
+DEFINE_FWK_EVENTSETUP_MODULE(DistanceBetweenComponentsESProducer5D);
 
 template <unsigned int N>
 DistanceBetweenComponentsESProducer<N>::DistanceBetweenComponentsESProducer(const edm::ParameterSet& p)
@@ -37,4 +57,4 @@ void DistanceBetweenComponentsESProducer<N>::fillDescriptions(edm::Configuration
   desc.add<std::string>("ComponentName");
 
   descriptions.addDefault(desc);
-}
+}
diff --git a/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h b/TrackingTools/GsfTools/plugins/DistanceBetweenComponentsESProducer.h
diff --git a/TrackingTools/GsfTools/plugins/module.cc b/TrackingTools/GsfTools/plugins/module.cc