improve metadata handling concepts

Author: aalkin

Framework/Core/include/Framework/ASoA.h

@@ -208,8 +208,20 @@ inline constexpr bool is_type_with_originals_v<T, std::void_t<decltype(sizeof(ty
 template <typename T>
 concept has_parent_t = not_void<typename T::parent_t>;
 
+template <typename INHERIT>
+class TableMetadata;
+
+template <typename T>
+concept is_metadata = framework::base_of_template<TableMetadata, T>;
+
+template <typename T>
+concept is_metadata_trait = framework::specialization_of_template<aod::MetadataTrait, T>;
+
+template <typename T>
+concept has_metadata = is_metadata_trait<T> && not_void<typename T::metadata>;
+
 template <typename T>
-concept has_metadata = not_void<typename T::metadata>;
+concept has_sources = is_metadata_trait<T> && not_void<typename T::sources>;
 
 template <typename T>
 concept is_spawnable_column = std::is_same_v<typename T::spawnable_t, std::true_type>;
@@ -1910,9 +1922,6 @@ class TableMetadata
   static std::string sourceSpec() { return fmt::format("{}/{:s}/{}/{}", INHERIT::mLabel, INHERIT::table_t::mOrigin, INHERIT::mDescription, INHERIT::mVersion); };
 };
 
-template <typename T>
-concept is_metadata = framework::is_base_of_template_v<TableMetadata, T>;
-
 /// Helper templates to define universal join and concat
 template <o2::framework::OriginEnc ORIGIN, typename... T>
 constexpr auto join(T const&... t)

Framework/Core/include/Framework/AnalysisTask.h

@@ -82,20 +82,15 @@ struct AnalysisDataProcessorBuilder {
     return std::vector{getSpec<T>()...};
   }
 
-  template <soa::is_index_table T>
-  static inline auto getSources()
-  {
-    return getInputSpecs(typename T::sources_t{});
-  }
-
   template <typename T>
+    requires soa::has_sources<typename o2::aod::MetadataTrait<std::decay_t<T>>::metadata>
   static inline auto getSources()
-    requires soa::with_base_table<std::decay_t<T>>
   {
-    return getInputSpecs(typename aod::MetadataTrait<T>::metadata::sources{});
+    return getInputSpecs(typename aod::MetadataTrait<std::decay_t<T>>::metadata::sources{});
   }
 
   template <typename T>
+    requires soa::has_sources<typename o2::aod::MetadataTrait<std::decay_t<T>>::metadata>
   static auto getInputMetadata()
   {
     std::vector<ConfigParamSpec> inputMetadata;
@@ -133,7 +128,7 @@ struct AnalysisDataProcessorBuilder {
     using metadata = typename aod::MetadataTrait<std::decay_t<O>>::metadata;
     std::vector<ConfigParamSpec> inputMetadata;
     inputMetadata.emplace_back(ConfigParamSpec{std::string{"control:"} + name, VariantType::Bool, value, {"\"\""}});
-    if constexpr (soa::is_index_table<std::decay_t<O>> || soa::with_base_table<std::decay_t<O>>) {
+    if constexpr (soa::has_sources<typename aod::MetadataTrait<std::decay_t<O>>::metadata>) {
       auto inputSources = getInputMetadata<std::decay_t<O>>();
       inputMetadata.insert(inputMetadata.end(), inputSources.begin(), inputSources.end());
     }