introduce string helpers for TableRef

aalkin · aalkin · commit e4d2e4ccf33e · 2024-11-21T11:10:15.000+01:00
diff --git a/Detectors/AOD/include/AODProducerWorkflow/AODProducerHelpers.h b/Detectors/AOD/include/AODProducerWorkflow/AODProducerHelpers.h
@@ -53,7 +53,7 @@ auto createTableCursor(framework::ProcessingContext& pc)
   framework::Produces<T> c;
   c.resetCursor(pc.outputs()
                   .make<framework::TableBuilder>(framework::OutputForTable<T>::ref()));
-  c.setLabel(o2::aod::Hash<T::ref.label_hash>::str);
+  c.setLabel(aod::label<T::ref>());
   return c;
 }
 } // namespace o2::aodhelpers
diff --git a/Detectors/AOD/src/StandaloneAODProducer.cxx b/Detectors/AOD/src/StandaloneAODProducer.cxx
@@ -94,7 +94,7 @@ void fillMCollisionTable(o2::steer::MCKinematicsReader const& mcreader)
 
   TFile outfile("aod.root", "UPDATE");
   {
-    TableToTree t2t(mccoltable, &outfile, o2::aod::Hash<o2::aod::McCollisions::ref.label_hash>::str);
+    TableToTree t2t(mccoltable, &outfile, aod::description_str(aod::signature<o2::aod::McCollisions::ref>()).data());
     t2t.addAllBranches();
     t2t.process();
   }
@@ -200,12 +200,12 @@ void fillCollisionAndTrackTable()
       f.Close();
       TFile outfile("aod.root", "RECREATE");
       {
-        TableToTree t2t(colltable, &outfile, o2::aod::Hash<o2::aod::Collisions::ref.label_hash>::str);
+        TableToTree t2t(colltable, &outfile, aod::description_str(aod::signature<o2::aod::Collisions::ref>()).data());
         t2t.addAllBranches();
         t2t.process();
       }
       {
-        TableToTree t2t(tracktable, &outfile, "Tracks" /* aod::MetadataTrait<o2::aod::Tracks>::metadata::tableLabel() */);
+        TableToTree t2t(tracktable, &outfile, aod::description_str(aod::signature<o2::aod::StoredTracks::ref>()).data());
         t2t.addAllBranches();
         t2t.process();
       }
diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
@@ -318,6 +318,31 @@ static inline constexpr header::DataDescription description(const char* const st
   return {out};
 }
 
+// Helpers to get strings from TableRef
+template <soa::TableRef R>
+consteval const char* label()
+{
+  return o2::aod::Hash<R.label_hash>::str;
+}
+
+template <soa::TableRef R>
+consteval const char* origin_str()
+{
+  return o2::aod::Hash<R.origin_hash>::str;
+}
+
+template <soa::TableRef R>
+consteval header::DataOrigin origin()
+{
+  return o2::aod::Hash<R.desc_hash>::origin;
+}
+
+template <soa::TableRef R>
+consteval const char* signature()
+{
+  return o2::aod::Hash<R.desc_hash>::str;
+}
+
 /// hash identification concepts
 template <typename T>
 concept is_aod_hash = requires(T t) { t.hash; t.str; };
@@ -329,7 +354,7 @@ concept is_origin_hash = is_aod_hash<T> && requires(T t) { t.origin; };
 template <soa::TableRef R>
 static constexpr auto sourceSpec()
 {
-  return fmt::format("{}/{}/{}/{}", o2::aod::Hash<R.label_hash>::str, o2::aod::Hash<R.origin_hash>::str, description(o2::aod::Hash<R.desc_hash>::str), R.version);
+  return fmt::format("{}/{}/{}/{}", label<R>(), origin_str<R>(), description_str(signature<R>()), R.version);
 }
 } // namespace o2::aod
 
@@ -1233,7 +1258,7 @@ concept is_index_table = framework::specialization_of_template<o2::soa::IndexTab
 template <soa::is_table T>
 static constexpr std::string getLabelForTable()
 {
-  return std::string{o2::aod::Hash<std::decay_t<T>::originals[0].label_hash>::str};
+  return std::string{aod::label<std::decay_t<T>::originals[0]>()};
 }
 
 template <soa::is_table T>
@@ -1269,7 +1294,7 @@ static constexpr auto hasColumnForKey(framework::pack<C...>, std::string const&
 template <TableRef ref>
 static constexpr std::pair<bool, std::string> hasKey(std::string const& key)
 {
-  return {hasColumnForKey(typename aod::MetadataTrait<o2::aod::Hash<ref.desc_hash>>::metadata::columns{}, key), o2::aod::Hash<ref.label_hash>::str};
+  return {hasColumnForKey(typename aod::MetadataTrait<o2::aod::Hash<ref.desc_hash>>::metadata::columns{}, key), aod::label<ref>()};
 }
 
 template <typename... C>
diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h
@@ -1621,13 +1621,13 @@ using TrackedV0 = TrackedV0s::iterator;
 using Tracked3Bodys = Tracked3Bodys;
 using Tracked3body = Tracked3Bodys::iterator;
 
-namespace origin
+namespace origins
 {
 DECLARE_SOA_COLUMN(DataframeID, dataframeID, uint64_t); //! Data frame ID (what is usually found in directory name in the AO2D.root, i.e. DF_XXX)
 } // namespace origin
 
 DECLARE_SOA_TABLE(Origins, "AOD", "ORIGIN", //! Table which contains the IDs of all dataframes merged into this dataframe
-                  o2::soa::Index<>, origin::DataframeID);
+                  o2::soa::Index<>, origins::DataframeID);
 
 using Origin = Origins::iterator;
 
diff --git a/Framework/Core/include/Framework/AnalysisHelpers.h b/Framework/Core/include/Framework/AnalysisHelpers.h
@@ -32,44 +32,44 @@ template <TableRef R>
 constexpr auto tableRef2InputSpec()
 {
   return framework::InputSpec{
-    o2::aod::Hash<R.label_hash>::str,
-    o2::aod::Hash<R.origin_hash>::origin,
-    o2::aod::description(o2::aod::Hash<R.desc_hash>::str),
+    o2::aod::label<R>(),
+    o2::aod::origin<R>(),
+    o2::aod::description(o2::aod::signature<R>()),
     R.version};
 }
 
 template <TableRef R>
 constexpr auto tableRef2OutputSpec()
 {
   return framework::OutputSpec{
-    framework::OutputLabel{o2::aod::Hash<R.label_hash>::str},
-    o2::aod::Hash<R.origin_hash>::origin,
-    o2::aod::description(o2::aod::Hash<R.desc_hash>::str),
+    framework::OutputLabel{o2::aod::label<R>()},
+    o2::aod::origin<R>(),
+    o2::aod::description(o2::aod::signature<R>()),
     R.version};
 }
 
 template <TableRef R>
 constexpr auto tableRef2Output()
 {
   return framework::Output{
-    o2::aod::Hash<R.origin_hash>::origin,
-    o2::aod::description(o2::aod::Hash<R.desc_hash>::str),
+    o2::aod::origin<R>(),
+    o2::aod::description(o2::aod::signature<R>()),
     R.version};
 }
 
 template <TableRef R>
 constexpr auto tableRef2OutputRef()
 {
   return framework::OutputRef{
-    o2::aod::Hash<R.label_hash>::str,
+    o2::aod::label<R>(),
     R.version};
 }
 
 template <TableRef R>
 constexpr auto tableRef2ConfigParamSpec()
 {
   return o2::framework::ConfigParamSpec{
-    std::string{"input:"} + o2::aod::Hash<R.label_hash>::str,
+    std::string{"input:"} + o2::aod::label<R>(),
     framework::VariantType::String,
     aod::sourceSpec<R>(),
     {"\"\""}};
@@ -163,12 +163,12 @@ struct OutputForTable {
 
   static OutputSpec const spec()
   {
-    return OutputSpec{OutputLabel{o2::aod::Hash<T::ref.label_hash>::str}, o2::aod::Hash<T::ref.origin_hash>::origin, o2::aod::description(o2::aod::Hash<T::ref.desc_hash>::str), T::ref.version};
+    return OutputSpec{OutputLabel{aod::label<T::ref>()}, o2::aod::origin<T::ref>(), o2::aod::description(o2::aod::signature<T::ref>()), T::ref.version};
   }
 
   static OutputRef ref()
   {
-    return OutputRef{o2::aod::Hash<T::ref.label_hash>::str, T::ref.version};
+    return OutputRef{aod::label<T::ref>(), T::ref.version};
   }
 };
 
@@ -440,7 +440,7 @@ struct Builds : decltype(transformBase<T>()) {
   template <typename Key, typename... Cs>
   auto build(framework::pack<Cs...>, std::vector<std::shared_ptr<arrow::Table>>&& tables)
   {
-    this->table = std::make_shared<T>(IP::template indexBuilder<Key, metadata::sources.size(), metadata::sources>(o2::aod::Hash<T::ref.label_hash>::str, std::forward<std::vector<std::shared_ptr<arrow::Table>>>(tables), framework::pack<Cs...>{}));
+    this->table = std::make_shared<T>(IP::template indexBuilder<Key, metadata::sources.size(), metadata::sources>(o2::aod::label<T::ref>(), std::forward<std::vector<std::shared_ptr<arrow::Table>>>(tables), framework::pack<Cs...>{}));
     return (this->table != nullptr);
   }
 };
diff --git a/Framework/Core/include/Framework/AnalysisManagers.h b/Framework/Core/include/Framework/AnalysisManagers.h
@@ -253,7 +253,7 @@ struct OutputManager<Produces<T>> {
   }
   static bool finalize(ProcessingContext&, Produces<T>& what)
   {
-    what.setLabel(o2::aod::Hash<Produces<T>::persistent_table_t::ref.label_hash>::str);
+    what.setLabel(o2::aod::label<Produces<T>::persistent_table_t::ref>());
     what.release();
     return true;
   }
@@ -335,7 +335,7 @@ template <size_t N, std::array<soa::TableRef, N> refs>
 static inline auto extractOriginals(ProcessingContext& pc)
 {
   return [&]<size_t... Is>(std::index_sequence<Is...>) -> std::vector<std::shared_ptr<arrow::Table>> {
-    return {pc.inputs().get<TableConsumer>(o2::aod::Hash<refs[Is].label_hash>::str)->asArrowTable()...};
+    return {pc.inputs().get<TableConsumer>(o2::aod::label<refs[Is]>())->asArrowTable()...};
   }(std::make_index_sequence<refs.size()>());
 }
 
@@ -353,10 +353,10 @@ struct OutputManager<Spawns<T>> {
     auto originalTable = soa::ArrowHelpers::joinTables(extractOriginals<metadata::sources.size(), metadata::sources>(pc));
     if (originalTable->schema()->fields().empty() == true) {
       using base_table_t = typename Spawns<T>::base_table_t::table_t;
-      originalTable = makeEmptyTable<base_table_t>(o2::aod::Hash<metadata::extension_table_t::ref.label_hash>::str);
+      originalTable = makeEmptyTable<base_table_t>(o2::aod::label<metadata::extension_table_t::ref>());
     }
 
-    what.extension = std::make_shared<typename Spawns<T>::extension_t>(o2::framework::spawner<o2::aod::Hash<metadata::extension_table_t::ref.desc_hash>>(originalTable, o2::aod::Hash<metadata::extension_table_t::ref.label_hash>::str));
+    what.extension = std::make_shared<typename Spawns<T>::extension_t>(o2::framework::spawner<o2::aod::Hash<metadata::extension_table_t::ref.desc_hash>>(originalTable, o2::aod::label<metadata::extension_table_t::ref>()));
     what.table = std::make_shared<typename T::table_t>(soa::ArrowHelpers::joinTables({what.extension->asArrowTable(), originalTable}));
     return true;
   }
diff --git a/Framework/Core/include/Framework/AnalysisTask.h b/Framework/Core/include/Framework/AnalysisTask.h
@@ -137,7 +137,7 @@ struct AnalysisDataProcessorBuilder {
       auto inputSources = getInputMetadata<metadata>();
       inputMetadata.insert(inputMetadata.end(), inputSources.begin(), inputSources.end());
     }
-    DataSpecUtils::updateInputList(inputs, InputSpec{o2::aod::Hash<R.label_hash>::str, o2::aod::Hash<R.origin_hash>::origin, aod::description(o2::aod::Hash<R.desc_hash>::str), aod::version(o2::aod::Hash<R.desc_hash>::str), Lifetime::Timeframe, inputMetadata});
+    DataSpecUtils::updateInputList(inputs, InputSpec{o2::aod::label<R>(), o2::aod::origin<R>(), aod::description(o2::aod::signature<R>()), R.version, Lifetime::Timeframe, inputMetadata});
   }
 
   template <typename R, typename C, typename... Args>
@@ -185,7 +185,7 @@ struct AnalysisDataProcessorBuilder {
   template <soa::TableRef R>
   static auto extractTableFromRecord(InputRecord& record)
   {
-    auto table = record.get<TableConsumer>(o2::aod::Hash<R.label_hash>::str)->asArrowTable();
+    auto table = record.get<TableConsumer>(o2::aod::label<R>())->asArrowTable();
     if (table->num_rows() == 0) {
       table = makeEmptyTable<R>();
     }
diff --git a/Framework/Core/include/Framework/TableBuilder.h b/Framework/Core/include/Framework/TableBuilder.h
@@ -871,7 +871,7 @@ auto makeEmptyTable()
 {
   TableBuilder b;
   [[maybe_unused]] auto writer = b.cursor(typename aod::MetadataTrait<aod::Hash<R.desc_hash>>::metadata::columns{});
-  b.setLabel(aod::Hash<R.label_hash>::str);
+  b.setLabel(aod::label<R>());
   return b.finalize();
 }
 
diff --git a/Framework/Core/src/AODReaderHelpers.cxx b/Framework/Core/src/AODReaderHelpers.cxx
@@ -81,7 +81,7 @@ template <size_t N, std::array<soa::TableRef, N> refs>
 static inline auto extractOriginals(ProcessingContext& pc)
 {
   return [&]<size_t... Is>(std::index_sequence<Is...>) -> std::vector<std::shared_ptr<arrow::Table>> {
-    return {pc.inputs().get<TableConsumer>(o2::aod::Hash<refs[Is].label_hash>::str)->asArrowTable()...};
+    return {pc.inputs().get<TableConsumer>(o2::aod::label<refs[Is]>())->asArrowTable()...};
   }(std::make_index_sequence<refs.size()>());
 }
 
diff --git a/Framework/Core/src/verifyAODFile.cxx b/Framework/Core/src/verifyAODFile.cxx
@@ -23,7 +23,7 @@ using namespace o2::soa;
 template <typename T>
 void verifyTable(TFile* infile, const char* branchName)
 {
-  std::cout << "Table: " << o2::aod::Hash<T::ref.label_hash>::str << std::endl;
+  std::cout << "Table: " << o2::aod::label<T::ref>() << std::endl;
   std::unique_ptr<TTreeReader> reader = std::make_unique<TTreeReader>(branchName, infile);
   TableBuilder builder;
   RootTableBuilderHelpers::convertASoA<T>(builder, *reader);

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ auto createTableCursor(framework::ProcessingContext& pc)`
`53`	`53`	`framework::Produces<T> c;`
`54`	`54`	`c.resetCursor(pc.outputs()`
`55`	`55`	`.make<framework::TableBuilder>(framework::OutputForTable<T>::ref()));`
`56`		`- c.setLabel(o2::aod::Hash<T::ref.label_hash>::str);`
	`56`	`+ c.setLabel(aod::label<T::ref>());`
`57`	`57`	`return c;`
`58`	`58`	`}`
`59`	`59`	`} // namespace o2::aodhelpers`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void fillMCollisionTable(o2::steer::MCKinematicsReader const& mcreader)`
`94`	`94`
`95`	`95`	`TFile outfile("aod.root", "UPDATE");`
`96`	`96`	`{`
`97`		`- TableToTree t2t(mccoltable, &outfile, o2::aod::Hash<o2::aod::McCollisions::ref.label_hash>::str);`
	`97`	`+ TableToTree t2t(mccoltable, &outfile, aod::description_str(aod::signature<o2::aod::McCollisions::ref>()).data());`
`98`	`98`	`t2t.addAllBranches();`
`99`	`99`	`t2t.process();`
`100`	`100`	`}`
`@@ -200,12 +200,12 @@ void fillCollisionAndTrackTable()`
`200`	`200`	`f.Close();`
`201`	`201`	`TFile outfile("aod.root", "RECREATE");`
`202`	`202`	`{`
`203`		`- TableToTree t2t(colltable, &outfile, o2::aod::Hash<o2::aod::Collisions::ref.label_hash>::str);`
	`203`	`+ TableToTree t2t(colltable, &outfile, aod::description_str(aod::signature<o2::aod::Collisions::ref>()).data());`
`204`	`204`	`t2t.addAllBranches();`
`205`	`205`	`t2t.process();`
`206`	`206`	`}`
`207`	`207`	`{`
`208`		`- TableToTree t2t(tracktable, &outfile, "Tracks" /* aod::MetadataTrait<o2::aod::Tracks>::metadata::tableLabel() */);`
	`208`	`+ TableToTree t2t(tracktable, &outfile, aod::description_str(aod::signature<o2::aod::StoredTracks::ref>()).data());`
`209`	`209`	`t2t.addAllBranches();`
`210`	`210`	`t2t.process();`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,44 +32,44 @@ template <TableRef R>`
`32`	`32`	`constexpr auto tableRef2InputSpec()`
`33`	`33`	`{`
`34`	`34`	`return framework::InputSpec{`
`35`		`- o2::aod::Hash<R.label_hash>::str,`
`36`		`- o2::aod::Hash<R.origin_hash>::origin,`
`37`		`- o2::aod::description(o2::aod::Hash<R.desc_hash>::str),`
	`35`	`+ o2::aod::label<R>(),`
	`36`	`+ o2::aod::origin<R>(),`
	`37`	`+ o2::aod::description(o2::aod::signature<R>()),`
`38`	`38`	`R.version};`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`template <TableRef R>`
`42`	`42`	`constexpr auto tableRef2OutputSpec()`
`43`	`43`	`{`
`44`	`44`	`return framework::OutputSpec{`
`45`		`- framework::OutputLabel{o2::aod::Hash<R.label_hash>::str},`
`46`		`- o2::aod::Hash<R.origin_hash>::origin,`
`47`		`- o2::aod::description(o2::aod::Hash<R.desc_hash>::str),`
	`45`	`+ framework::OutputLabel{o2::aod::label<R>()},`
	`46`	`+ o2::aod::origin<R>(),`
	`47`	`+ o2::aod::description(o2::aod::signature<R>()),`
`48`	`48`	`R.version};`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`template <TableRef R>`
`52`	`52`	`constexpr auto tableRef2Output()`
`53`	`53`	`{`
`54`	`54`	`return framework::Output{`
`55`		`- o2::aod::Hash<R.origin_hash>::origin,`
`56`		`- o2::aod::description(o2::aod::Hash<R.desc_hash>::str),`
	`55`	`+ o2::aod::origin<R>(),`
	`56`	`+ o2::aod::description(o2::aod::signature<R>()),`
`57`	`57`	`R.version};`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`template <TableRef R>`
`61`	`61`	`constexpr auto tableRef2OutputRef()`
`62`	`62`	`{`
`63`	`63`	`return framework::OutputRef{`
`64`		`- o2::aod::Hash<R.label_hash>::str,`
	`64`	`+ o2::aod::label<R>(),`
`65`	`65`	`R.version};`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`template <TableRef R>`
`69`	`69`	`constexpr auto tableRef2ConfigParamSpec()`
`70`	`70`	`{`
`71`	`71`	`return o2::framework::ConfigParamSpec{`
`72`		`- std::string{"input:"} + o2::aod::Hash<R.label_hash>::str,`
	`72`	`+ std::string{"input:"} + o2::aod::label<R>(),`
`73`	`73`	`framework::VariantType::String,`
`74`	`74`	`aod::sourceSpec<R>(),`
`75`	`75`	`{"\"\""}};`
`@@ -163,12 +163,12 @@ struct OutputForTable {`
`163`	`163`
`164`	`164`	`static OutputSpec const spec()`
`165`	`165`	`{`
`166`		`- return OutputSpec{OutputLabel{o2::aod::Hash<T::ref.label_hash>::str}, o2::aod::Hash<T::ref.origin_hash>::origin, o2::aod::description(o2::aod::Hash<T::ref.desc_hash>::str), T::ref.version};`
	`166`	`+ return OutputSpec{OutputLabel{aod::label<T::ref>()}, o2::aod::origin<T::ref>(), o2::aod::description(o2::aod::signature<T::ref>()), T::ref.version};`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`static OutputRef ref()`
`170`	`170`	`{`
`171`		`- return OutputRef{o2::aod::Hash<T::ref.label_hash>::str, T::ref.version};`
	`171`	`+ return OutputRef{aod::label<T::ref>(), T::ref.version};`
`172`	`172`	`}`
`173`	`173`	`};`
`174`	`174`
`@@ -440,7 +440,7 @@ struct Builds : decltype(transformBase<T>()) {`
`440`	`440`	`template <typename Key, typename... Cs>`
`441`	`441`	`auto build(framework::pack<Cs...>, std::vector<std::shared_ptr<arrow::Table>>&& tables)`
`442`	`442`	`{`
`443`		`- this->table = std::make_shared<T>(IP::template indexBuilder<Key, metadata::sources.size(), metadata::sources>(o2::aod::Hash<T::ref.label_hash>::str, std::forward<std::vector<std::shared_ptr<arrow::Table>>>(tables), framework::pack<Cs...>{}));`
	`443`	`+ this->table = std::make_shared<T>(IP::template indexBuilder<Key, metadata::sources.size(), metadata::sources>(o2::aod::label<T::ref>(), std::forward<std::vector<std::shared_ptr<arrow::Table>>>(tables), framework::pack<Cs...>{}));`
`444`	`444`	`return (this->table != nullptr);`
`445`	`445`	`}`
`446`	`446`	`};`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ struct OutputManager<Produces<T>> {`
`253`	`253`	`}`
`254`	`254`	`static bool finalize(ProcessingContext&, Produces<T>& what)`
`255`	`255`	`{`
`256`		`- what.setLabel(o2::aod::Hash<Produces<T>::persistent_table_t::ref.label_hash>::str);`
	`256`	`+ what.setLabel(o2::aod::label<Produces<T>::persistent_table_t::ref>());`
`257`	`257`	`what.release();`
`258`	`258`	`return true;`
`259`	`259`	`}`
`@@ -335,7 +335,7 @@ template <size_t N, std::array<soa::TableRef, N> refs>`
`335`	`335`	`static inline auto extractOriginals(ProcessingContext& pc)`
`336`	`336`	`{`
`337`	`337`	`return [&]<size_t... Is>(std::index_sequence<Is...>) -> std::vector<std::shared_ptr<arrow::Table>> {`
`338`		`- return {pc.inputs().get<TableConsumer>(o2::aod::Hash<refs[Is].label_hash>::str)->asArrowTable()...};`
	`338`	`+ return {pc.inputs().get<TableConsumer>(o2::aod::label<refs[Is]>())->asArrowTable()...};`
`339`	`339`	`}(std::make_index_sequence<refs.size()>());`
`340`	`340`	`}`
`341`	`341`
`@@ -353,10 +353,10 @@ struct OutputManager<Spawns<T>> {`
`353`	`353`	`auto originalTable = soa::ArrowHelpers::joinTables(extractOriginals<metadata::sources.size(), metadata::sources>(pc));`
`354`	`354`	`if (originalTable->schema()->fields().empty() == true) {`
`355`	`355`	`using base_table_t = typename Spawns<T>::base_table_t::table_t;`
`356`		`- originalTable = makeEmptyTable<base_table_t>(o2::aod::Hash<metadata::extension_table_t::ref.label_hash>::str);`
	`356`	`+ originalTable = makeEmptyTable<base_table_t>(o2::aod::label<metadata::extension_table_t::ref>());`
`357`	`357`	`}`
`358`	`358`
`359`		`- what.extension = std::make_shared<typename Spawns<T>::extension_t>(o2::framework::spawner<o2::aod::Hash<metadata::extension_table_t::ref.desc_hash>>(originalTable, o2::aod::Hash<metadata::extension_table_t::ref.label_hash>::str));`
	`359`	`+ what.extension = std::make_shared<typename Spawns<T>::extension_t>(o2::framework::spawner<o2::aod::Hash<metadata::extension_table_t::ref.desc_hash>>(originalTable, o2::aod::label<metadata::extension_table_t::ref>()));`
`360`	`360`	`what.table = std::make_shared<typename T::table_t>(soa::ArrowHelpers::joinTables({what.extension->asArrowTable(), originalTable}));`
`361`	`361`	`return true;`
`362`	`362`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ struct AnalysisDataProcessorBuilder {`
`137`	`137`	`auto inputSources = getInputMetadata<metadata>();`
`138`	`138`	`inputMetadata.insert(inputMetadata.end(), inputSources.begin(), inputSources.end());`
`139`	`139`	`}`
`140`		`- DataSpecUtils::updateInputList(inputs, InputSpec{o2::aod::Hash<R.label_hash>::str, o2::aod::Hash<R.origin_hash>::origin, aod::description(o2::aod::Hash<R.desc_hash>::str), aod::version(o2::aod::Hash<R.desc_hash>::str), Lifetime::Timeframe, inputMetadata});`
	`140`	`+ DataSpecUtils::updateInputList(inputs, InputSpec{o2::aod::label<R>(), o2::aod::origin<R>(), aod::description(o2::aod::signature<R>()), R.version, Lifetime::Timeframe, inputMetadata});`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`template <typename R, typename C, typename... Args>`
`@@ -185,7 +185,7 @@ struct AnalysisDataProcessorBuilder {`
`185`	`185`	`template <soa::TableRef R>`
`186`	`186`	`static auto extractTableFromRecord(InputRecord& record)`
`187`	`187`	`{`
`188`		`- auto table = record.get<TableConsumer>(o2::aod::Hash<R.label_hash>::str)->asArrowTable();`
	`188`	`+ auto table = record.get<TableConsumer>(o2::aod::label<R>())->asArrowTable();`
`189`	`189`	`if (table->num_rows() == 0) {`
`190`	`190`	`table = makeEmptyTable<R>();`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ auto makeEmptyTable()`
`871`	`871`	`{`
`872`	`872`	`TableBuilder b;`
`873`	`873`	`[[maybe_unused]] auto writer = b.cursor(typename aod::MetadataTrait<aod::Hash<R.desc_hash>>::metadata::columns{});`
`874`		`- b.setLabel(aod::Hash<R.label_hash>::str);`
	`874`	`+ b.setLabel(aod::label<R>());`
`875`	`875`	`return b.finalize();`
`876`	`876`	`}`
`877`	`877`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ template <size_t N, std::array<soa::TableRef, N> refs>`
`81`	`81`	`static inline auto extractOriginals(ProcessingContext& pc)`
`82`	`82`	`{`
`83`	`83`	`return [&]<size_t... Is>(std::index_sequence<Is...>) -> std::vector<std::shared_ptr<arrow::Table>> {`
`84`		`- return {pc.inputs().get<TableConsumer>(o2::aod::Hash<refs[Is].label_hash>::str)->asArrowTable()...};`
	`84`	`+ return {pc.inputs().get<TableConsumer>(o2::aod::label<refs[Is]>())->asArrowTable()...};`
`85`	`85`	`}(std::make_index_sequence<refs.size()>());`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ using namespace o2::soa;`
`23`	`23`	`template <typename T>`
`24`	`24`	`void verifyTable(TFile* infile, const char* branchName)`
`25`	`25`	`{`
`26`		`- std::cout << "Table: " << o2::aod::Hash<T::ref.label_hash>::str << std::endl;`
	`26`	`+ std::cout << "Table: " << o2::aod::label<T::ref>() << std::endl;`
`27`	`27`	`std::unique_ptr<TTreeReader> reader = std::make_unique<TTreeReader>(branchName, infile);`
`28`	`28`	`TableBuilder builder;`
`29`	`29`	`RootTableBuilderHelpers::convertASoA<T>(builder, *reader);`