Skip to content

DPL Analysis: make Attach preserve the filtered status of the table #13939

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

Closed
aalkin wants to merge 3 commits into from
+16 −1
Closed

DPL Analysis: make Attach preserve the filtered status of the table #13939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91614c7
DPL Analysis: make Attach preserve the filtered status of the table
aalkin Feb 5, 2025
e421f95
Update AnalysisHelpers.h
aalkin Mar 13, 2025
808d92a
Merge branch 'dev' into filtered-attach
aalkin Apr 17, 2025
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
4 changes: 4 additions & 0 deletions Framework/Core/include/Framework/ASoA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2276,6 +2276,10 @@ O2ORIGIN("CONC");
O2HASH("CONC/0");
O2ORIGIN("TEST");
O2HASH("TEST/0");
O2HASH("ATT/0");
O2ORIGIN("ATT");
O2HASH("EXT/0");
O2ORIGIN("EXT");
} // namespace o2::aod

#define DECLARE_EQUIVALENT_FOR_INDEX(_Base_, _Equiv_) \
Expand Down
13 changes: 12 additions & 1 deletion Framework/Core/include/Framework/AnalysisHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,22 @@ auto Extend(T const& table)
/// Template function to attach dynamic columns on-the-fly (e.g. inside
/// process() function). Dynamic columns need to be compatible with the table.
template <soa::is_table T, soa::is_dynamic_column... Cs>
requires(!soa::is_filtered_table<T>)
auto Attach(T const& table)
{
using output_t = Join<T, o2::soa::Table<o2::aod::Hash<"JOIN"_h>, o2::aod::Hash<"JOIN/0"_h>, o2::aod::Hash<"JOIN"_h>, Cs...>>;
using output_t = Join<T, o2::soa::Table<o2::aod::Hash<"ATT"_h>, o2::aod::Hash<"ATT/0"_h>, o2::aod::Hash<"ATT"_h>, Cs...>>;
return output_t{{table.asArrowTable()}, table.offset()};
}

template <soa::is_filtered_table T, soa::is_dynamic_column... Cs>
auto Attach(T const& table)
{
using output_t = soa::Filtered<soa::Join<typename T::table_t, o2::soa::Table<o2::aod::Hash<"ATT"_h>, o2::aod::Hash<"ATT/0"_h>, o2::aod::Hash<"ATT"_h>, Cs...>>>;
SelectionVector selection;
selection.reserve(table.getSelectedRows().size());
std::copy(table.getSelectedRows().begin(), table.getSelectedRows().end(), std::back_inserter(selection));
return output_t{{table.asArrowTable()}, std::move(selection), table.offset()};
}
} // namespace o2::soa

#endif // o2_framework_AnalysisHelpers_H_DEFINED