Skip to content

DPL Analysis: cleanup AnalysisTask.h and ASoA.h #14996

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 8 commits into from
Jan 29, 2026
+128 −149
Merged

DPL Analysis: cleanup AnalysisTask.h and ASoA.h #14996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06f9d13
remove unnecessary include; unnecessary mutability; too specific requ…
aalkin Jan 21, 2026
90e8fe5
use non-capturing lambdas; restrict template
aalkin Jan 21, 2026
0a354a0
we only expect void process functions
aalkin Jan 21, 2026
597d7e1
improve getIterators
aalkin Jan 26, 2026
5c22ff4
improve homogeneous_apply_ref
aalkin Jan 27, 2026
4b678b1
Please consider the following formatting changes
alibuild Jan 27, 2026
af9cb29
Merge pull request #125 from alibuild/alibot-cleanup-14996
aalkin Jan 27, 2026
c8e3ab4
Merge branch 'dev' into cleanups-misc-more
aalkin Jan 28, 2026
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
62 changes: 22 additions & 40 deletions Framework/Core/include/Framework/ASoA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,15 +405,15 @@ class Table;
/// Type-checking index column binding
struct Binding {
void const* ptr = nullptr;
size_t hash = 0;
std::span<TableRef const> refs;
uint32_t hash = 0;
// std::span<TableRef const> refs;

template <typename T>
void bind(T const* table)
{
ptr = table;
hash = o2::framework::TypeIdHelpers::uniqueId<T>();
refs = std::span{T::originals};
// refs = std::span{T::originals};
}

template <typename T>
Expand Down Expand Up @@ -1293,6 +1293,9 @@ struct ArrowHelpers {
template <typename T>
concept is_iterator = framework::base_of_template<TableIterator, T> || framework::specialization_of_template<TableIterator, T>;

template <typename T>
concept is_table_or_iterator = is_table<T> || is_iterator<T>;

template <typename T>
concept with_originals = requires {
T::originals.size();
Expand Down Expand Up @@ -2724,7 +2727,7 @@ consteval auto getIndexTargets()
return !(*mColumnIterator).empty(); \
} \
\
template <typename T> \
template <soa::is_table T> \
auto _Getter_##_as() const \
{ \
if (O2_BUILTIN_UNLIKELY(mBinding.ptr == nullptr)) { \
Expand All @@ -2734,10 +2737,15 @@ consteval auto getIndexTargets()
if (O2_BUILTIN_UNLIKELY(t == nullptr)) { \
o2::soa::dereferenceWithWrongType(#_Getter_, #_Table_); \
} \
return getIterators<T>(); \
auto result = std::vector<typename T::unfiltered_iterator>(); \
result.reserve((*mColumnIterator).size()); \
for (auto& i : *mColumnIterator) { \
result.emplace_back(t->rawIteratorAt(i)); \
} \
return result; \
} \
\
template <typename T> \
template <soa::is_filtered_table T> \
auto filtered_##_Getter_##_as() const \
{ \
if (O2_BUILTIN_UNLIKELY(mBinding.ptr == nullptr)) { \
Expand All @@ -2747,35 +2755,15 @@ consteval auto getIndexTargets()
if (O2_BUILTIN_UNLIKELY(t == nullptr)) { \
o2::soa::dereferenceWithWrongType(#_Getter_, #_Table_); \
} \
return getFilteredIterators<T>(); \
} \
\
template <typename T> \
auto getIterators() const \
{ \
auto result = std::vector<typename T::unfiltered_iterator>(); \
for (auto& i : *mColumnIterator) { \
result.push_back(mBinding.get<T>()->rawIteratorAt(i)); \
} \
return result; \
} \
\
template <typename T> \
std::vector<typename T::iterator> getFilteredIterators() const \
{ \
if constexpr (o2::soa::is_filtered_table<T>) { \
auto result = std::vector<typename T::iterator>(); \
for (auto const& i : *mColumnIterator) { \
auto pos = mBinding.get<T>()->isInSelectedRows(i); \
if (pos > 0) { \
result.emplace_back(mBinding.get<T>()->iteratorAt(pos)); \
} \
auto result = std::vector<typename T::iterator>(); \
result.reserve((*mColumnIterator).size()); \
for (auto const& i : *mColumnIterator) { \
auto pos = t->isInSelectedRows(i); \
if (pos > 0) { \
result.emplace_back(t->iteratorAt(pos)); \
} \
return result; \
} else { \
static_assert(o2::framework::always_static_assert_v<T>, "T is not a Filtered type"); \
} \
return {}; \
return result; \
} \
\
auto _Getter_() const \
Expand Down Expand Up @@ -3090,15 +3078,9 @@ consteval auto getIndexTargets()
if (O2_BUILTIN_UNLIKELY(t == nullptr)) { \
o2::soa::dereferenceWithWrongType(#_Getter_, "self"); \
} \
return getIterators<T>(); \
} \
\
template <typename T> \
auto getIterators() const \
{ \
auto result = std::vector<typename T::unfiltered_iterator>(); \
for (auto& i : *mColumnIterator) { \
result.push_back(mBinding.get<T>()->rawIteratorAt(i)); \
result.push_back(t->rawIteratorAt(i)); \
} \
return result; \
} \
Expand Down
6 changes: 0 additions & 6 deletions Framework/Core/include/Framework/AnalysisManagers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,12 +534,6 @@ void bindExternalIndicesPartition(P& partition, T*... tables)
}

/// Cache handling
template <typename T>
bool preInitializeCache(InitContext&, T&)
{
return false;
}

template <typename T>
bool initializeCache(ProcessingContext&, T&)
{
Expand Down
Loading