do not use all_columns pack where the template arguments are available

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -1061,15 +1061,15 @@ struct TableIterator : IP, C... {
 
   TableIterator(arrow::ChunkedArray* columnData[sizeof...(C)], IP&& policy)
     : IP{policy},
-      C(columnData[framework::has_type_at_v<C>(all_columns{})])...
+      C(columnData[framework::has_type_at_v<C>(framework::pack<C...>{})])...
   {
     bind();
   }
 
   TableIterator(arrow::ChunkedArray* columnData[sizeof...(C)], IP&& policy)
     requires(has_index<C...>)
     : IP{policy},
-      C(columnData[framework::has_type_at_v<C>(all_columns{})])...
+      C(columnData[framework::has_type_at_v<C>(framework::pack<C...>{})])...
   {
     bind();
     // In case we have an index column might need to constrain the actual
@@ -1147,60 +1147,38 @@ struct TableIterator : IP, C... {
     return *this;
   }
 
-  template <typename... CL, typename TA>
-  void doSetCurrentIndex(framework::pack<CL...>, TA* current)
-  {
-    (doSetCurrentIndexImpl<CL>(current), ...);
-  }
-
   template <typename CL>
   auto getCurrent() const
   {
     return CL::getCurrentRaw();
   }
 
-  template <typename... Cs>
-  auto getIndexBindingsImpl(framework::pack<Cs...>) const
+  auto getIndexBindings() const
   {
     std::vector<o2::soa::Binding> result;
-    (doGetIndexBindingImpl<Cs>(result), ...);
+    (doGetIndexBindingImpl<C>(result), ...);
     return result;
   }
 
-  auto getIndexBindings() const
-  {
-    return getIndexBindingsImpl(all_columns{});
-  }
-
   template <typename... TA>
   void bindExternalIndices(TA*... current)
   {
-    (doSetCurrentIndex(all_columns{}, current), ...);
-  }
-
-  template <typename... Cs>
-  void doSetCurrentIndexRaw(framework::pack<Cs...> p, std::vector<o2::soa::Binding>&& bindings)
-  {
-    (doSetCurrentIndexRawImpl<Cs>(bindings[framework::has_type_at_v<Cs>(p)]), ...);
-  }
-
-  template <typename... Cs, typename I>
-  void doSetCurrentInternal(framework::pack<Cs...>, I const* ptr)
-  {
-    o2::soa::Binding b;
-    b.bind(ptr);
-    (doSetCurrentInternalImpl<Cs>(b), ...);
+    ([this]<typename... Cs, typename TT>(framework::pack<Cs...>, TT* t){
+      (doSetCurrentIndexImpl<Cs>(t), ...);
+    }(framework::pack<C...>{}, current), ...);
   }
 
   void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& bindings)
   {
-    doSetCurrentIndexRaw(all_columns{}, std::forward<std::vector<o2::soa::Binding>>(bindings));
+    (doSetCurrentIndexRawImpl<C>(bindings[framework::has_type_at_v<C>(framework::pack<C...>{})]), ...);
   }
 
   template <typename I>
   void bindInternalIndices(I const* table)
   {
-    doSetCurrentInternal(all_columns{}, table);
+    o2::soa::Binding b;
+    b.bind(table);
+    (doSetCurrentInternalImpl<C>(b), ...);
   }
 
  private: