From 97f12ef40059322ae9f177e4993310be3363f288 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Wed, 29 Jan 2025 09:36:44 +0100
Subject: [PATCH] Revert "DPL Analysis: remove unnecessary instances of
 selected_pack (#13892)"

This reverts commit 53ed758f32eaf659b7a9dc0a7c701fcd300a7544.
---
 Framework/Core/include/Framework/ASoA.h       | 115 ++++++------------
 .../Core/include/Framework/Configurable.h     |   5 +-
 .../include/Framework/GroupedCombinations.h   |  22 +---
 3 files changed, 41 insertions(+), 101 deletions(-)

diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
index 8ef7ed9539ec7..8af872a64176d 100644
--- a/Framework/Core/include/Framework/ASoA.h
+++ b/Framework/Core/include/Framework/ASoA.h
@@ -208,6 +208,8 @@ template <typename D, typename... Cs>
 struct TableMetadata {
   using columns = framework::pack<Cs...>;
   using persistent_columns_t = framework::selected_pack<soa::is_persistent_column_t, Cs...>;
+  using external_index_columns_t = framework::selected_pack<soa::is_external_index_t, Cs...>;
+  using internal_index_columns_t = framework::selected_pack<soa::is_self_index_t, Cs...>;
 
   template <typename Key, typename... PCs>
   static consteval std::array<bool, sizeof...(PCs)> getMap(framework::pack<PCs...>)
@@ -804,6 +806,9 @@ concept is_dynamic_column = requires(C& c) {
 template <typename C>
 concept is_marker_column = requires { &C::mark; };
 
+template <typename T>
+using is_dynamic_t = std::conditional_t<is_dynamic_column<T>, std::true_type, std::false_type>;
+
 template <typename T>
 concept is_column = is_persistent_column<T> || is_dynamic_column<T> || is_indexing_column<T> || is_marker_column<T>;
 
@@ -1026,17 +1031,6 @@ concept can_bind = requires(T&& t) {
 template <typename... C>
 concept has_index = (is_indexing_column<C> || ...);
 
-template <is_index_column C>
-  requires(!is_self_index_column<C>)
-consteval auto getBinding() -> typename C::binding_t
-{
-}
-
-template <typename C>
-consteval auto getBinding() -> void
-{
-}
-
 template <typename D, typename O, typename IP, typename... C>
 struct TableIterator : IP, C... {
  public:
@@ -1044,9 +1038,9 @@ struct TableIterator : IP, C... {
   using policy_t = IP;
   using all_columns = framework::pack<C...>;
   using persistent_columns_t = framework::selected_pack<soa::is_persistent_column_t, C...>;
-  using bindings_pack_t = decltype([]<typename... Cs>(framework::pack<Cs...>) {
-    return framework::pack<decltype(getBinding<Cs>())...>{};
-  }(all_columns{}));
+  using external_index_columns_t = framework::selected_pack<soa::is_external_index_t, C...>;
+  using internal_index_columns_t = framework::selected_pack<soa::is_self_index_t, C...>;
+  using bindings_pack_t = decltype([]<typename... Cs>(framework::pack<Cs...>) -> framework::pack<typename Cs::binding_t...> {}(external_index_columns_t{})); // decltype(extractBindings(external_index_columns_t{}));
 
   TableIterator(arrow::ChunkedArray* columnData[sizeof...(C)], IP&& policy)
     : IP{policy},
@@ -1139,13 +1133,7 @@ struct TableIterator : IP, C... {
   template <typename... CL, typename TA>
   void doSetCurrentIndex(framework::pack<CL...>, TA* current)
   {
-    (framework::overloaded{
-      [&current, this]<is_index_column CI>
-        requires(!is_self_index_column<CI>)
-      () { CI::setCurrent(current); },
-      []<typename CI>() {}}
-        .template operator()<CL>(),
-      ...);
+    (CL::setCurrent(current), ...);
   }
 
   template <typename CL>
@@ -1157,40 +1145,24 @@ struct TableIterator : IP, C... {
   template <typename... Cs>
   auto getIndexBindingsImpl(framework::pack<Cs...>) const
   {
-    std::vector<o2::soa::Binding> result;
-    (framework::overloaded{
-      [this, &result]<is_index_column CI>
-        requires(!is_self_index_column<CI>)
-      () mutable {
-        result.emplace_back(CI::getCurrentRaw());
-      },
-      []<typename CI>() {}}
-        .template operator()<Cs>(),
-      ...);
-    return result;
+    return std::vector<o2::soa::Binding>{static_cast<Cs const&>(*this).getCurrentRaw()...};
   }
 
   auto getIndexBindings() const
   {
-    return getIndexBindingsImpl(all_columns{});
+    return getIndexBindingsImpl(external_index_columns_t{});
   }
 
   template <typename... TA>
   void bindExternalIndices(TA*... current)
   {
-    (doSetCurrentIndex(all_columns{}, current), ...);
+    (doSetCurrentIndex(external_index_columns_t{}, current), ...);
   }
 
   template <typename... Cs>
   void doSetCurrentIndexRaw(framework::pack<Cs...> p, std::vector<o2::soa::Binding>&& ptrs)
   {
-    (framework::overloaded{
-      [&ptrs, p, this]<is_self_index_column CI>
-        requires(!is_self_index_column<CI>)
-      () { CI::setCurrentRaw(ptrs[framework::has_type_at_v<CI>(p)]); },
-      []<typename CI>() {}}
-        .template operator()<Cs>(),
-      ...);
+    (Cs::setCurrentRaw(ptrs[framework::has_type_at_v<Cs>(p)]), ...);
   }
 
   template <typename... Cs, typename I>
@@ -1198,22 +1170,18 @@ struct TableIterator : IP, C... {
   {
     o2::soa::Binding b;
     b.bind(ptr);
-    (framework::overloaded{
-       [&ptr, &b, this]<is_self_index_column CI>() { CI::setCurrentRaw(b); },
-       []<typename CI>() {}}
-       .template operator()<Cs>(),
-     ...);
+    (Cs::setCurrentRaw(b), ...);
   }
 
   void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)
   {
-    doSetCurrentIndexRaw(all_columns{}, std::forward<std::vector<o2::soa::Binding>>(ptrs));
+    doSetCurrentIndexRaw(external_index_columns_t{}, std::forward<std::vector<o2::soa::Binding>>(ptrs));
   }
 
   template <typename I>
   void bindInternalIndices(I const* table)
   {
-    doSetCurrentInternal(all_columns{}, table);
+    doSetCurrentInternal(internal_index_columns_t{}, table);
   }
 
  private:
@@ -1397,37 +1365,25 @@ static constexpr std::string getLabelFromTypeForKey(std::string const& key)
 template <typename B, typename... C>
 consteval static bool hasIndexTo(framework::pack<C...>&&)
 {
-  return (framework::overloaded{
-    []<is_index_column CI>
-      requires(!is_self_index_column<CI>)
-    () { return o2::soa::is_binding_compatible_v<B, typename CI::binding_t>(); },
-    []<typename CI>() { return false; }}
-      .template operator()<C>() ||
-    ...);
+  return (o2::soa::is_binding_compatible_v<B, typename C::binding_t>() || ...);
 }
 
 template <typename B, typename... C>
 consteval static bool hasSortedIndexTo(framework::pack<C...>&&)
 {
-  return (framework::overloaded{
-    []<is_index_column CI>
-      requires(!is_self_index_column<CI>)
-    () { return (CI::sorted && o2::soa::is_binding_compatible_v<B, typename CI::binding_t>()); },
-    []<typename CI>() {}}
-      .template operator()<C>() ||
-    ...);
+  return ((C::sorted && o2::soa::is_binding_compatible_v<B, typename C::binding_t>()) || ...);
 }
 
 template <typename B, typename Z>
 consteval static bool relatedByIndex()
 {
-  return hasIndexTo<B>(typename Z::table_t::columns_t{});
+  return hasIndexTo<B>(typename Z::table_t::external_index_columns_t{});
 }
 
 template <typename B, typename Z>
 consteval static bool relatedBySortedIndex()
 {
-  return hasSortedIndexTo<B>(typename Z::table_t::columns_t{});
+  return hasSortedIndexTo<B>(typename Z::table_t::external_index_columns_t{});
 }
 } // namespace o2::soa
 
@@ -1770,13 +1726,16 @@ class Table
   using persistent_columns_t = decltype([]<typename... C>(framework::pack<C...>&&) -> framework::selected_pack<soa::is_persistent_column_t, C...> {}(columns_t{}));
   using column_types = decltype([]<typename... C>(framework::pack<C...>) -> framework::pack<typename C::type...> {}(persistent_columns_t{}));
 
+  using external_index_columns_t = decltype([]<typename... C>(framework::pack<C...>&&) -> framework::selected_pack<soa::is_external_index_t, C...> {}(columns_t{}));
+  using internal_index_columns_t = decltype([]<typename... C>(framework::pack<C...>&&) -> framework::selected_pack<soa::is_self_index_t, C...> {}(columns_t{}));
   template <typename IP>
   using base_iterator = decltype(base_iter<D, O, IP>(columns_t{}));
 
   template <typename IP, typename Parent, typename... T>
   struct TableIteratorBase : base_iterator<IP> {
     using columns_t = typename Parent::columns_t;
-    using bindings_pack_t = typename base_iterator<IP>::bindings_pack_t;
+    using external_index_columns_t = typename Parent::external_index_columns_t;
+    using bindings_pack_t = decltype([]<typename... C>(framework::pack<C...>) -> framework::pack<typename C::binding_t...> {}(external_index_columns_t{}));
     // static constexpr const std::array<TableRef, sizeof...(T)> originals{T::ref...};
     static constexpr auto originals = Parent::originals;
     using policy_t = IP;
@@ -1869,7 +1828,7 @@ class Table
       using decayed = std::decay_t<TI>;
       if constexpr (framework::has_type<decayed>(bindings_pack_t{})) { // index to another table
         constexpr auto idx = framework::has_type_at_v<decayed>(bindings_pack_t{});
-        return framework::pack_element_t<idx, columns_t>::getId();
+        return framework::pack_element_t<idx, external_index_columns_t>::getId();
       } else if constexpr (std::same_as<decayed, Parent>) { // self index
         return this->globalIndex();
       } else if constexpr (is_indexing_column<decayed>) { // soa::Index<>
@@ -1879,17 +1838,20 @@ class Table
       }
     }
 
-    template <soa::is_dynamic_column CD, typename... CDArgs>
+    template <typename CD, typename... CDArgs>
     auto getDynamicColumn() const
     {
-      return static_cast<std::decay_t<CD>>(*this).template getDynamicValue<CDArgs...>();
+      using decayed = std::decay_t<CD>;
+      static_assert(is_dynamic_t<decayed>(), "Requested column is not a dynamic column");
+      return static_cast<decayed>(*this).template getDynamicValue<CDArgs...>();
     }
 
     template <typename B, typename CC>
-      requires(is_dynamic_column<CC> || is_persistent_column<CC>)
     auto getValue() const
     {
-      return static_cast<B>(static_cast<std::decay_t<CC>>(*this).get());
+      using COL = std::decay_t<CC>;
+      static_assert(is_dynamic_t<COL>() || soa::is_persistent_column<COL>, "Should be persistent or dynamic column with no argument that has a return type convertable to float");
+      return static_cast<B>(static_cast<COL>(*this).get());
     }
 
     template <typename B, typename... CCs>
@@ -2094,17 +2056,13 @@ class Table
 
   void bindInternalIndicesExplicit(o2::soa::Binding binding)
   {
-    doBindInternalIndicesExplicit(columns_t{}, binding);
+    doBindInternalIndicesExplicit(internal_index_columns_t{}, binding);
   }
 
   template <typename... Cs>
   void doBindInternalIndicesExplicit(framework::pack<Cs...>, o2::soa::Binding binding)
   {
-    (framework::overloaded{
-       [this, &binding]<is_self_index_column CI>() { static_cast<CI>(mBegin).setCurrentRaw(binding); },
-       []<typename CI>() {}}
-       .template operator()<Cs>(),
-     ...);
+    (static_cast<Cs>(mBegin).setCurrentRaw(binding), ...);
   }
 
   void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)
@@ -2121,7 +2079,7 @@ class Table
   template <typename T>
   void copyIndexBindings(T& dest) const
   {
-    doCopyIndexBindings(columns_t{}, dest);
+    doCopyIndexBindings(external_index_columns_t{}, dest);
   }
 
   auto select(framework::expressions::Filter const& f) const
@@ -3340,6 +3298,7 @@ class FilteredBase : public T
   using T::originals;
   using columns_t = typename T::columns_t;
   using persistent_columns_t = typename T::persistent_columns_t;
+  using external_index_columns_t = typename T::external_index_columns_t;
 
   using iterator = T::template iterator_template_o<FilteredIndexPolicy, self_t>;
   using unfiltered_iterator = T::template iterator_template_o<DefaultIndexPolicy, self_t>;
@@ -3485,7 +3444,7 @@ class FilteredBase : public T
   template <typename T1>
   void copyIndexBindings(T1& dest) const
   {
-    doCopyIndexBindings(columns_t{}, dest);
+    doCopyIndexBindings(external_index_columns_t{}, dest);
   }
 
   template <typename T1>
diff --git a/Framework/Core/include/Framework/Configurable.h b/Framework/Core/include/Framework/Configurable.h
index 930c37e700105..88e50cf3c7c26 100644
--- a/Framework/Core/include/Framework/Configurable.h
+++ b/Framework/Core/include/Framework/Configurable.h
@@ -83,9 +83,6 @@ struct Configurable : IP {
 template <typename T, ConfigParamKind K = ConfigParamKind::kGeneric>
 using MutableConfigurable = Configurable<T, K, ConfigurablePolicyMutable<T, K>>;
 
-template <typename T>
-concept is_configurable = requires(T& t) { &T::operator typename T::type; };
-
 using ConfigurableAxis = Configurable<std::vector<double>, ConfigParamKind::kAxisSpec, ConfigurablePolicyConst<std::vector<double>, ConfigParamKind::kAxisSpec>>;
 
 template <typename R, typename T, typename... As>
@@ -100,7 +97,7 @@ struct ProcessConfigurable : Configurable<bool, ConfigParamKind::kProcessFlag> {
 };
 
 template <typename T>
-concept is_process_configurable = is_configurable<T> && requires(T& t) { t.process; };
+concept is_process_configurable = base_of_template<ProcessConfigurable, T>;
 
 #define PROCESS_SWITCH(_Class_, _Name_, _Help_, _Default_) \
   decltype(ProcessConfigurable{&_Class_ ::_Name_, #_Name_, _Default_, _Help_}) do##_Name_ = ProcessConfigurable{&_Class_ ::_Name_, #_Name_, _Default_, _Help_};
diff --git a/Framework/Core/include/Framework/GroupedCombinations.h b/Framework/Core/include/Framework/GroupedCombinations.h
index 9f450489ac50f..21d8384e3aa6e 100644
--- a/Framework/Core/include/Framework/GroupedCombinations.h
+++ b/Framework/Core/include/Framework/GroupedCombinations.h
@@ -34,30 +34,14 @@ auto interleaveTuples(std::tuple<T1s...>& t1, std::tuple<T2s...>& t2)
   return interleaveTuplesImpl(t1, t2, std::index_sequence_for<T1s...>());
 }
 
-template <soa::is_index_column T, typename G>
-  requires(!soa::is_self_index_column<T>)
-consteval auto isIndexTo()
-{
-  if constexpr (o2::soa::is_binding_compatible_v<G, typename T::binding_t>()) {
-    return std::true_type{};
-  } else {
-    return std::false_type{};
-  }
-}
-
-template <typename T, typename G>
-consteval auto isIndexTo()
-{
-  return std::false_type{};
-}
-
 template <typename T, typename G>
-using is_index_to_g_t = decltype(isIndexTo<T, G>());
+using is_index_to_g_t = typename std::conditional<o2::soa::is_binding_compatible_v<G, typename T::binding_t>(), std::true_type, std::false_type>::type;
 
 template <typename G, typename A>
 expressions::BindingNode getMatchingIndexNode()
 {
-  using selected_indices_t = selected_pack_multicondition<is_index_to_g_t, pack<G>, typename A::columns_t>;
+  using external_index_columns_pack = typename A::external_index_columns_t;
+  using selected_indices_t = selected_pack_multicondition<is_index_to_g_t, pack<G>, external_index_columns_pack>;
   static_assert(pack_size(selected_indices_t{}) == 1, "No matching index column from associated to grouping");
   using index_column_t = pack_head_t<selected_indices_t>;
   return expressions::BindingNode{index_column_t::mLabel, o2::framework::TypeIdHelpers::uniqueId<typename index_column_t::column_t>(), expressions::selectArrowType<typename index_column_t::type>()};