post rebase fixes

AliceO2Group · Dec 10, 2024 · 6861013 · 6861013
1 parent 6d1f8e6
commit 6861013
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
@@ -2185,7 +2185,7 @@ template <typename R, typename T>
 using ColumnGetterFunction = R (*)(const T&);
 
 template <typename T, typename R>
-concept dynamic_with_common_getter = is_dynamic_v<T> &&
+concept dynamic_with_common_getter = is_dynamic_column<T> &&
                                      // lambda is callable without additional free args
                                      framework::pack_size(typename T::bindings_t{}) == framework::pack_size(typename T::callable_t::args{}) &&
                                      requires(T t) {
@@ -2242,7 +2242,7 @@ using with_common_getter_t = typename std::conditional<persistent_with_common_ge
 template <typename R, typename T>
 ColumnGetterFunction<R, typename T::iterator> getColumnGetterByLabel(const std::string_view& targetColumnLabel)
 {
-  using TypesWithCommonGetter = o2::framework::selected_pack_multicondition<with_common_getter_t, framework::pack<R>, typename T::columns>;
+  using TypesWithCommonGetter = o2::framework::selected_pack_multicondition<with_common_getter_t, framework::pack<R>, typename T::columns_t>;
 
   if (targetColumnLabel.size() == 0) {
     throw framework::runtime_error("columnLabel: must not be empty");

diff --git a/Framework/Core/test/benchmark_ASoA.cxx b/Framework/Core/test/benchmark_ASoA.cxx
@@ -304,7 +304,7 @@ static void BM_ASoADynamicColumnPresentGetGetterByLabel(benchmark::State& state)
   }
   auto table = builder.finalize();
 
-  using Test = o2::soa::Table<o2::framework::OriginEnc{"AOD"}, test::X, test::Y, test::Z, test::Sum<test::X, test::Y>>;
+  using Test = o2::soa::InPlaceTable<"A/0"_h, test::X, test::Y, test::Z, test::Sum<test::X, test::Y>>;
 
   for (auto _ : state) {
     Test tests{table};
@@ -362,7 +362,7 @@ static void BM_ASoADynamicColumnCallGetGetterByLabel(benchmark::State& state)
   auto table = builder.finalize();
 
   // SumFreeArgs presence checks if dynamic columns get() is handled correctly during compilation
-  using Test = o2::soa::Table<o2::framework::OriginEnc{"AOD"}, test::X, test::Y, test::Sum<test::X, test::Y>, test::SumFreeArgs<test::X, test::Y>>;
+  using Test = o2::soa::InPlaceTable<"A/0"_h, test::X, test::Y, test::Sum<test::X, test::Y>, test::SumFreeArgs<test::X, test::Y>>;
 
   Test tests{table};
   for (auto _ : state) {