ignore label

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -3851,6 +3851,12 @@ consteval auto getIndexTargets()
 #define DECLARE_SOA_TABLE_METADATA(_Name_, _Desc_, _Version_, ...) \
     using _Name_##Metadata = TableMetadataNG<Hash<_Desc_ "/" #_Version_ ""_h>, __VA_ARGS__>;            \
 
+#define DECLARE_SOA_TABLE_METADATA_TRAIT(_Name_, _Desc_, _Version_)\
+  template <>                                                                                       \
+  struct MetadataTraitNG<Hash<_Desc_ "/" #_Version_ ""_h>> {                                        \
+    using metadata = _Name_##Metadata;                                                              \
+  };
+
 #define DECLARE_SOA_TABLE_FULL_VERSIONED_(_Name_, _Label_, _Origin_, _Desc_, _Version_)               \
   O2HASH(_Desc_ "/" #_Version_);                                                                      \
   template <typename O>                                                                               \
@@ -3861,14 +3867,20 @@ consteval auto getIndexTargets()
     using metadata = _Name_##Metadata;                                                                \
   };
 
+#define DECLARE_SOA_STAGE(_Name_, _Origin_, _Desc_, _Version_)              \
+  template <typename O>                                                                               \
+  using _Name_##From = o2::soa::TableNG<Hash<#_Name_ ""_h>, Hash<_Desc_ "/" #_Version_ ""_h>, O>;     \
+  using _Name_ = _Name_##From<Hash<_Origin_ ""_h>>;
+
 #define DECLARE_SOA_TABLE_FULL_VERSIONED(_Name_, _Label_, _Origin_, _Desc_, _Version_, ...)        \
+  O2HASH(#_Name_);\
   DECLARE_SOA_TABLE_METADATA(_Name_, _Desc_, _Version_, __VA_ARGS__);                              \
-  DECLARE_SOA_TABLE_FULL_VERSIONED_(_Name_, _Label_, _Origin_, _Desc_, _Version_);
+  DECLARE_SOA_TABLE_FULL_VERSIONED_(_Name_, #_Name_, _Origin_, _Desc_, _Version_);
 
 #define DECLARE_SOA_TABLE_FULL(_Name_, _Label_, _Origin_, _Desc_, ...) \
-  O2HASH(_Label_);                                                     \
+  O2HASH(#_Name_);                                                     \
   DECLARE_SOA_TABLE_METADATA(_Name_, _Desc_, 0, __VA_ARGS__);          \
-  DECLARE_SOA_TABLE_FULL_VERSIONED_(_Name_, _Label_, _Origin_, _Desc_, 0)
+  DECLARE_SOA_TABLE_FULL_VERSIONED_(_Name_, #_Name_, _Origin_, _Desc_, 0)
 
 #define DECLARE_SOA_TABLE(_Name_, _Origin_, _Desc_, ...) \
   DECLARE_SOA_TABLE_FULL(_Name_, #_Name_, _Origin_, _Desc_, __VA_ARGS__)
@@ -3884,8 +3896,9 @@ consteval auto getIndexTargets()
   O2HASH("Stored" #_BaseName_);                                                                     \
   DECLARE_SOA_TABLE_METADATA(_BaseName_, _Desc_, _Version_, __VA_ARGS__);                           \
   using Stored##_BaseName_##Metadata = _BaseName_##Metadata;                                        \
-  DECLARE_SOA_TABLE_FULL_VERSIONED_(_BaseName_, #_BaseName_, "AOD", _Desc_, _Version_);             \
-  DECLARE_SOA_TABLE_FULL_VERSIONED_(Stored##_BaseName_, "Stored" #_BaseName_, "AOD1", _Desc_, _Version_);
+  DECLARE_SOA_TABLE_METADATA_TRAIT(_BaseName_, _Desc_, _Version_);                                  \
+  DECLARE_SOA_STAGE(_BaseName_, "AOD", _Desc_, _Version_);                                          \
+  DECLARE_SOA_STAGE(Stored##_BaseName_, "AOD1", _Desc_, _Version_);
 
 #define DECLARE_SOA_TABLE_STAGED(_BaseName_, _Desc_, ...) \
   DECLARE_SOA_TABLE_STAGED_VERSIONED(_BaseName_, _Desc_, 0, __VA_ARGS__);

Framework/Core/test/test_AnalysisTask.cxx

@@ -262,7 +262,7 @@ TEST_CASE("AdaptorCompilation")
   REQUIRE(task1ng.inputs.size() == 2);
   REQUIRE(task1ng.outputs.size() == 1);
   REQUIRE(task1ng.inputs[1].binding == std::string("TracksExtension"));
-  REQUIRE(task1ng.inputs[0].binding == std::string("Tracks"));
+  REQUIRE(task1ng.inputs[0].binding == std::string("StoredTracks"));
   REQUIRE(task1ng.outputs[0].binding.value == std::string("FooBars"));
 
   auto task1ngc = adaptAnalysisTask<ATaskconsumer>(*cfgc);
@@ -276,11 +276,11 @@ TEST_CASE("AdaptorCompilation")
   auto task2 = adaptAnalysisTask<BTask>(*cfgc, TaskName{"test2"});
   REQUIRE(task2.inputs.size() == 10);
   REQUIRE(task2.inputs[2].binding == "TracksExtension");
-  REQUIRE(task2.inputs[1].binding == "Tracks");
+  REQUIRE(task2.inputs[1].binding == "StoredTracks");
   REQUIRE(task2.inputs[4].binding == "TracksExtra_001Extension");
-  REQUIRE(task2.inputs[3].binding == "TracksExtra");
+  REQUIRE(task2.inputs[3].binding == "StoredTracksExtra_001");
   REQUIRE(task2.inputs[6].binding == "TracksCovExtension");
-  REQUIRE(task2.inputs[5].binding == "TracksCov");
+  REQUIRE(task2.inputs[5].binding == "StoredTracksCov");
   REQUIRE(task2.inputs[7].binding == "AmbiguousTracks");
   REQUIRE(task2.inputs[8].binding == "Calos");
   REQUIRE(task2.inputs[9].binding == "CaloTriggers");
@@ -289,12 +289,12 @@ TEST_CASE("AdaptorCompilation")
   auto task3 = adaptAnalysisTask<CTask>(*cfgc, TaskName{"test3"});
   REQUIRE(task3.inputs.size() == 3);
   REQUIRE(task3.inputs[0].binding == "Collisions_001");
-  REQUIRE(task3.inputs[1].binding == "Tracks");
+  REQUIRE(task3.inputs[1].binding == "StoredTracks");
   REQUIRE(task3.inputs[2].binding == "TracksExtension");
 
   auto task4 = adaptAnalysisTask<DTask>(*cfgc, TaskName{"test4"});
   REQUIRE(task4.inputs.size() == 2);
-  REQUIRE(task4.inputs[0].binding == "Tracks");
+  REQUIRE(task4.inputs[0].binding == "StoredTracks");
   REQUIRE(task4.inputs[1].binding == "TracksExtension");
 
   auto task5 = adaptAnalysisTask<ETask>(*cfgc, TaskName{"test5"});