Skip to content

DPL Analysis: fix analysis CCDB fetcher still using origin #15336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Apr 29, 2026
+40 −31
Merged

DPL Analysis: fix analysis CCDB fetcher still using origin #15336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Framework/CCDBSupport/src/AnalysisCCDBHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ namespace
void fillValidRoutes(CCDBFetcherHelper& helper, std::vector<o2::framework::OutputRoute> const& outputRoutes, std::unordered_map<std::string, int>& bindings)
{
for (auto& route : outputRoutes) {
auto originMatcher = DataSpecUtils::asConcreteDataMatcher(route.matcher);
if (originMatcher.origin != header::DataOrigin{"ATIM"}) {
if (std::ranges::none_of(route.matcher.metadata, [](auto const& m) { return m.name.starts_with("ccdb:"); })) {
continue;
}
auto specStr = DataSpecUtils::describe(route.matcher);
Expand Down
68 changes: 39 additions & 29 deletions Framework/Core/include/Framework/ASoA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3407,38 +3407,48 @@ consteval auto getIndexTargets()
//
// The columns of this table have to be CCDB_COLUMNS so that for each timestamp, we get a row
// which points to the specified CCDB objectes described by those columns.
#define DECLARE_SOA_TIMESTAMPED_TABLE_FULL(_Name_, _Label_, _TimestampSource_, _TimestampColumn_, _Origin_, _Version_, _Desc_, ...) \
O2HASH(_Desc_ "/" #_Version_); \
template <typename O> \
using _Name_##TimestampFrom = soa::Table<o2::aod::Hash<_Label_ ""_h>, o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>, O>; \
using _Name_##Timestamp = _Name_##TimestampFrom<o2::aod::Hash<_Origin_ ""_h>>; \
struct _Name_##TimestampMetadata : TableMetadata<o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>, __VA_ARGS__> { \
template <typename O = o2::aod::Hash<_Origin_ ""_h>> \
using base_table_t = _TimestampSource_##From<O>; \
template <typename O = o2::aod::Hash<_Origin_ ""_h>> \
using extension_table_t = _Name_##TimestampFrom<O>; \
static constexpr const auto ccdb_urls = []<typename... Cs>(framework::pack<Cs...>) { \
return std::array<std::string_view, sizeof...(Cs)>{Cs::query...}; \
}(framework::pack<__VA_ARGS__>{}); \
static constexpr const auto ccdb_bindings = []<typename... Cs>(framework::pack<Cs...>) { \
return std::array<std::string_view, sizeof...(Cs)>{Cs::mLabel...}; \
}(framework::pack<__VA_ARGS__>{}); \
template <typename O = o2::aod::Hash<_Origin_ ""_h>> \
static constexpr auto sources = _TimestampSource_##From<O>::originals; \
static constexpr auto timestamp_column_label = _TimestampColumn_::mLabel; \
/*static constexpr auto timestampColumn = _TimestampColumn_;*/ \
}; \
template <> \
struct MetadataTrait<o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>> { \
using metadata = _Name_##TimestampMetadata; \
}; \
template <typename O> \
using _Name_##From = o2::soa::Join<_TimestampSource_, _Name_##TimestampFrom<O>>; \
using _Name_ = _Name_##From<o2::aod::Hash<_Origin_ ""_h>>;
#define DECLARE_SOA_TIMESTAMPED_TABLE_FULL(_Name_, _Label_, _TimestampSource_, _TimestampColumn_, _Version_, _Desc_, ...) \
O2HASH(_Desc_ "/" #_Version_); \
template <typename O> \
using _Name_##TimestampFrom = soa::Table<o2::aod::Hash<_Label_ ""_h>, o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>, O>; \
using _Name_##Timestamp = _Name_##TimestampFrom<o2::aod::Hash< \
"AOD" \
""_h>>; \
struct _Name_##TimestampMetadata : TableMetadata<o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>, __VA_ARGS__> { \
template <typename O = o2::aod::Hash<"AOD" \
""_h>> \
using base_table_t = _TimestampSource_##From<O>; \
template <typename O = o2::aod::Hash<"AOD" \
""_h>> \
using extension_table_t = _Name_##TimestampFrom<O>; \
static constexpr const auto ccdb_urls = []<typename... Cs>(framework::pack<Cs...>) { \
return std::array<std::string_view, sizeof...(Cs)>{Cs::query...}; \
}(framework::pack<__VA_ARGS__>{}); \
static constexpr const auto ccdb_bindings = []<typename... Cs>(framework::pack<Cs...>) { \
return std::array<std::string_view, sizeof...(Cs)>{Cs::mLabel...}; \
}(framework::pack<__VA_ARGS__>{}); \
static constexpr auto N = _TimestampSource_::originals.size(); \
template <o2::aod::is_origin_hash O = o2::aod::Hash<"AOD"_h>> \
static consteval auto generateSources() \
{ \
return _TimestampSource_##From<O>::originals; \
} \
static constexpr auto timestamp_column_label = _TimestampColumn_::mLabel; \
/*static constexpr auto timestampColumn = _TimestampColumn_;*/ \
}; \
template <> \
struct MetadataTrait<o2::aod::Hash<_Desc_ "/" #_Version_ ""_h>> { \
using metadata = _Name_##TimestampMetadata; \
}; \
template <typename O> \
using _Name_##From = o2::soa::Join<_TimestampSource_, _Name_##TimestampFrom<O>>; \
using _Name_ = _Name_##From<o2::aod::Hash< \
"AOD" \
""_h>>;

#define DECLARE_SOA_TIMESTAMPED_TABLE(_Name_, _TimestampSource_, _TimestampColumn_, _Version_, _Desc_, ...) \
O2HASH(#_Name_ "Timestamped"); \
DECLARE_SOA_TIMESTAMPED_TABLE_FULL(_Name_, #_Name_ "Timestamped", _TimestampSource_, _TimestampColumn_, "AOD", _Version_, _Desc_, __VA_ARGS__)
DECLARE_SOA_TIMESTAMPED_TABLE_FULL(_Name_, #_Name_ "Timestamped", _TimestampSource_, _TimestampColumn_, _Version_, _Desc_, __VA_ARGS__)

namespace o2::soa
{
Expand Down