Merge pull request cms-sw#33645 from rovere/CLUE3D_12X

[HGCAL] Pattern Recognition as Plugins, with CLUE3D addition.

Author: cmsbuild

Configuration/ProcessModifiers/python/clue3D_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is for injecting CLUE3D-based iterations in TICL.
+
+clue3D =  cms.Modifier()

RecoHGCal/TICL/BuildFile.xml

@@ -2,6 +2,7 @@
 <use name="DataFormats/HGCalReco"/>
 <use name="DataFormats/VertexReco"/>
 <use name="FWCore/PluginManager"/>
+<use name="PhysicsTools/TensorFlow"/>
 <export>
   <lib name="1"/>
 </export>

RecoHGCal/TICL/plugins/GlobalCache.h renamed to RecoHGCal/TICL/interface/GlobalCache.h

@@ -12,7 +12,8 @@
 #include "DataFormats/HGCalReco/interface/TICLSeedingRegion.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Common/interface/ValueMap.h"
-#include "RecoHGCal/TICL/plugins/GlobalCache.h"
+#include "RecoHGCal/TICL/interface/GlobalCache.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 namespace edm {
   class Event;
@@ -23,7 +24,7 @@ namespace ticl {
   template <typename TILES>
   class PatternRecognitionAlgoBaseT {
   public:
-    PatternRecognitionAlgoBaseT(const edm::ParameterSet& conf, const CacheBase* cache)
+    PatternRecognitionAlgoBaseT(const edm::ParameterSet& conf, const CacheBase* cache, edm::ConsumesCollector)
         : algo_verbosity_(conf.getParameter<int>("algo_verbosity")) {}
     virtual ~PatternRecognitionAlgoBaseT(){};
 

RecoHGCal/TICL/plugins/PatternRecognitionAlgoBase.h renamed to RecoHGCal/TICL/interface/PatternRecognitionAlgoBase.h

@@ -0,0 +1,11 @@
+#include "RecoHGCal/TICL/plugins/PatternRecognitionPluginFactory.h"
+#include "PatternRecognitionbyCA.h"
+#include "PatternRecognitionbyCLUE3D.h"
+#include "FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h"
+#include "FWCore/ParameterSet/interface/ValidatedPluginMacros.h"
+
+EDM_REGISTER_VALIDATED_PLUGINFACTORY(PatternRecognitionFactory, "PatternRecognitionFactory");
+EDM_REGISTER_VALIDATED_PLUGINFACTORY(PatternRecognitionHFNoseFactory, "PatternRecognitionHFNoseFactory");
+DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory, ticl::PatternRecognitionbyCA<TICLLayerTiles>, "CA");
+DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionFactory, ticl::PatternRecognitionbyCLUE3D<TICLLayerTiles>, "CLUE3D");
+DEFINE_EDM_VALIDATED_PLUGIN(PatternRecognitionHFNoseFactory, ticl::PatternRecognitionbyCA<TICLLayerTilesHFNose>, "CA");

RecoHGCal/TICL/plugins/PatternRecognitionPluginFactory.cc

@@ -0,0 +1,17 @@
+#ifndef RecoHGCal_TICL_PatternRecognitionPluginFactory_H
+#define RecoHGCal_TICL_PatternRecognitionPluginFactory_H
+
+#include "FWCore/PluginManager/interface/PluginFactory.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "RecoHGCal/TICL/interface/PatternRecognitionAlgoBase.h"
+#include "RecoHGCal/TICL/interface/GlobalCache.h"
+
+typedef edmplugin::PluginFactory<ticl::PatternRecognitionAlgoBaseT<TICLLayerTiles>*(
+    const edm::ParameterSet&, const ticl::CacheBase*, edm::ConsumesCollector)>
+    PatternRecognitionFactory;
+typedef edmplugin::PluginFactory<ticl::PatternRecognitionAlgoBaseT<TICLLayerTilesHFNose>*(
+    const edm::ParameterSet&, const ticl::CacheBase*, edm::ConsumesCollector)>
+    PatternRecognitionHFNoseFactory;
+
+#endif

RecoHGCal/TICL/plugins/PatternRecognitionPluginFactory.h

@@ -19,7 +19,7 @@ template <typename TILES>
 PatternRecognitionbyCA<TILES>::PatternRecognitionbyCA(const edm::ParameterSet &conf,
                                                       const CacheBase *cache,
                                                       edm::ConsumesCollector iC)
-    : PatternRecognitionAlgoBaseT<TILES>(conf, cache),
+    : PatternRecognitionAlgoBaseT<TILES>(conf, cache, iC),
       caloGeomToken_(iC.esConsumes<CaloGeometry, CaloGeometryRecord>()),
       theGraph_(std::make_unique<HGCGraphT<TILES>>()),
       oneTracksterPerTrackSeed_(conf.getParameter<bool>("oneTracksterPerTrackSeed")),
@@ -468,5 +468,34 @@ void PatternRecognitionbyCA<TILES>::energyRegressionAndID(const std::vector<reco
   }
 }
 
+template <typename TILES>
+void PatternRecognitionbyCA<TILES>::fillPSetDescription(edm::ParameterSetDescription &iDesc) {
+  iDesc.add<int>("algo_verbosity", 0);
+  iDesc.add<bool>("oneTracksterPerTrackSeed", false);
+  iDesc.add<bool>("promoteEmptyRegionToTrackster", false);
+  iDesc.add<bool>("out_in_dfs", true);
+  iDesc.add<int>("max_out_in_hops", 10);
+  iDesc.add<double>("min_cos_theta", 0.915);
+  iDesc.add<double>("min_cos_pointing", -1.);
+  iDesc.add<double>("root_doublet_max_distance_from_seed_squared", 9999);
+  iDesc.add<double>("etaLimitIncreaseWindow", 2.1);
+  iDesc.add<int>("skip_layers", 0);
+  iDesc.add<int>("max_missing_layers_in_trackster", 9999);
+  iDesc.add<int>("shower_start_max_layer", 9999)->setComment("make default such that no filtering is applied");
+  iDesc.add<int>("min_layers_per_trackster", 10);
+  iDesc.add<std::vector<int>>("filter_on_categories", {0});
+  iDesc.add<double>("pid_threshold", 0.)->setComment("make default such that no filtering is applied");
+  iDesc.add<double>("energy_em_over_total_threshold", -1.)
+      ->setComment("make default such that no filtering is applied");
+  iDesc.add<double>("max_longitudinal_sigmaPCA", 9999);
+  iDesc.add<double>("max_delta_time", 3.)->setComment("nsigma");
+  iDesc.add<std::string>("eid_input_name", "input");
+  iDesc.add<std::string>("eid_output_name_energy", "output/regressed_energy");
+  iDesc.add<std::string>("eid_output_name_id", "output/id_probabilities");
+  iDesc.add<double>("eid_min_cluster_energy", 1.);
+  iDesc.add<int>("eid_n_layers", 50);
+  iDesc.add<int>("eid_n_clusters", 10);
+}
+
 template class ticl::PatternRecognitionbyCA<TICLLayerTiles>;
 template class ticl::PatternRecognitionbyCA<TICLLayerTilesHFNose>;

RecoHGCal/TICL/plugins/PatternRecognitionbyCA.cc

@@ -4,10 +4,9 @@
 #ifndef __RecoHGCal_TICL_PRbyCA_H__
 #define __RecoHGCal_TICL_PRbyCA_H__
 #include <memory>  // unique_ptr
-#include "RecoHGCal/TICL/plugins/PatternRecognitionAlgoBase.h"
+#include "RecoHGCal/TICL/interface/PatternRecognitionAlgoBase.h"
 #include "RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h"
 #include "PhysicsTools/TensorFlow/interface/TensorFlow.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "HGCGraph.h"
 
 namespace ticl {
@@ -26,6 +25,8 @@ namespace ticl {
                                      std::unordered_map<int, std::vector<int>>& seedToTracksterAssociation,
                                      const edm::ProductID& collectionID) const;
 
+    static void fillPSetDescription(edm::ParameterSetDescription& iDesc);
+
   private:
     void mergeTrackstersTRK(const std::vector<Trackster>&,
                             const std::vector<reco::CaloCluster>&,