PWGJE: Generalize jet matching (AliceO2Group#2488)

* Generalize jet matching

* Update

* Add matching for charged jets

* Fix formatting

* Fix jet matching

* Update jet matching

* Fix jet matching and add inclusive case

* Fix geometric jet matching

Author: qgp

PWGJE/Core/JetUtilities.h

@@ -122,7 +122,7 @@ std::tuple<std::vector<int>, std::vector<int>> MatchJetsGeometricallyImpl(
   const std::size_t nJetsBase = jetsBaseEta.size();
   const std::size_t nJetsTag = jetsTagEta.size();
   if (!(nJetsBase && nJetsTag)) {
-    return std::make_tuple(std::vector<int>(nJetsBase), std::vector<int>(nJetsTag));
+    return std::make_tuple(std::vector<int>(nJetsBase, -1), std::vector<int>(nJetsTag, -1));
   }
   // Require that the comparison vectors are greater than or equal to the standard collections.
   if (jetsBasePhiForMatching.size() < jetsBasePhi.size()) {
@@ -253,7 +253,7 @@ std::tuple<std::vector<int>, std::vector<int>> MatchJetsGeometrically(
   const std::size_t nJetsTag = jetsTagEta.size();
   if (!(nJetsBase && nJetsTag)) {
     // There are no jets, so nothing to be done.
-    return std::make_tuple(std::vector<int>(nJetsBase), std::vector<int>(nJetsTag));
+    return std::make_tuple(std::vector<int>(nJetsBase, -1), std::vector<int>(nJetsTag, -1));
   }
   // Input sizes must match
   if (jetsBasePhi.size() != jetsBaseEta.size()) {

PWGJE/DataModel/Jet.h

@@ -73,34 +73,34 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
 } // namespace o2::aod
 
 // Defines the jet table definition
-#define DECLARE_JET_TABLE(_collision_name_, _jet_type_, _name_, _description_) \
-  namespace _name_##util                                                       \
-  {                                                                            \
-    DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_##s, dummy##_jet_type##s,      \
-                               []() -> int { return 0; });                     \
-  }                                                                            \
-  DECLARE_SOA_TABLE(_jet_type_##s, "AOD", _description_,                       \
-                    o2::soa::Index<>,                                          \
-                    jet::_collision_name_##Id,                                 \
-                    jet::Pt,                                                   \
-                    jet::Eta,                                                  \
-                    jet::Phi,                                                  \
-                    jet::Energy,                                               \
-                    jet::Mass,                                                 \
-                    jet::Area,                                                 \
-                    jet::R,                                                    \
-                    jet::Px<jet::Pt, jet::Phi>,                                \
-                    jet::Py<jet::Pt, jet::Phi>,                                \
-                    jet::Pz<jet::Pt, jet::Eta>,                                \
-                    jet::P<jet::Pt, jet::Eta>,                                 \
-                    _name_##util::Dummy##_jet_type_##s<>);                     \
-  namespace _name_##matchingGeo                                                \
-  {                                                                            \
-    DECLARE_SOA_INDEX_COLUMN(_jet_type_, matchedJetGeo);                       \
-  }                                                                            \
-  namespace _name_##matchingCand                                               \
-  {                                                                            \
-    DECLARE_SOA_INDEX_COLUMN(_jet_type_, matchedJetCand);                      \
+#define DECLARE_JET_TABLE(_collision_name_, _jet_type_, _name_, _description_)                \
+  namespace _name_##util                                                                      \
+  {                                                                                           \
+    DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_##s, dummy##_jet_type##s,                     \
+                               []() -> int { return 0; });                                    \
+  }                                                                                           \
+  DECLARE_SOA_TABLE(_jet_type_##s, "AOD", _description_,                                      \
+                    o2::soa::Index<>,                                                         \
+                    jet::_collision_name_##Id,                                                \
+                    jet::Pt,                                                                  \
+                    jet::Eta,                                                                 \
+                    jet::Phi,                                                                 \
+                    jet::Energy,                                                              \
+                    jet::Mass,                                                                \
+                    jet::Area,                                                                \
+                    jet::R,                                                                   \
+                    jet::Px<jet::Pt, jet::Phi>,                                               \
+                    jet::Py<jet::Pt, jet::Phi>,                                               \
+                    jet::Pz<jet::Pt, jet::Eta>,                                               \
+                    jet::P<jet::Pt, jet::Eta>,                                                \
+                    _name_##util::Dummy##_jet_type_##s<>);                                    \
+  namespace _name_##matchingGeo                                                               \
+  {                                                                                           \
+    DECLARE_SOA_INDEX_COLUMN_FULL(_jet_type_, matchedJetGeo, int32_t, _jet_type_##s, "_geo"); \
+  }                                                                                           \
+  namespace _name_##matchingCand                                                              \
+  {                                                                                           \
+    DECLARE_SOA_INDEX_COLUMN_FULL(_jet_type_, matchedJetCand, int32_t, _jet_type_##s, "_hf"); \
   }
 
 #define DECLARE_CONSTITUENTS_TABLE(_jet_type_, _name_, _Description_, _track_type_, _cand_type_)      \
@@ -159,7 +159,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(P, p,
 
 namespace o2::aod
 {
-DECLARE_JET_TABLES_LEVELS(Charged, HfCand2Prong, "");
+DECLARE_JET_TABLES_LEVELS(Charged, HfCand2Prong, "C");
 DECLARE_JET_TABLES_LEVELS(Full, HfCand2Prong, "F");
 DECLARE_JET_TABLES_LEVELS(Neutral, HfCand2Prong, "N");
 DECLARE_JET_TABLES_LEVELS(D0Charged, HfCand2Prong, "D0");