Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Revert "DPL Analysis: cleanup AnalysisTask.h and ASoA.h" #15005

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
Jan 30, 2026
+149 −128
Merged

Revert "DPL Analysis: cleanup AnalysisTask.h and ASoA.h" #15005

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
62 changes: 40 additions & 22 deletions 62 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;
uint32_t hash = 0;
// std::span<TableRef const> refs;
size_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,9 +1293,6 @@ 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 @@ -2727,7 +2724,7 @@ consteval auto getIndexTargets()
return !(*mColumnIterator).empty(); \
} \
\
template <soa::is_table T> \
template <typename T> \
auto _Getter_##_as() const \
{ \
if (O2_BUILTIN_UNLIKELY(mBinding.ptr == nullptr)) { \
Expand All @@ -2737,15 +2734,10 @@ consteval auto getIndexTargets()
if (O2_BUILTIN_UNLIKELY(t == nullptr)) { \
o2::soa::dereferenceWithWrongType(#_Getter_, #_Table_); \
} \
auto result = std::vector<typename T::unfiltered_iterator>(); \
result.reserve((*mColumnIterator).size()); \
for (auto& i : *mColumnIterator) { \
result.emplace_back(t->rawIteratorAt(i)); \
} \
return result; \
return getIterators<T>(); \
} \
\
template <soa::is_filtered_table T> \
template <typename T> \
auto filtered_##_Getter_##_as() const \
{ \
if (O2_BUILTIN_UNLIKELY(mBinding.ptr == nullptr)) { \
Expand All @@ -2755,17 +2747,37 @@ consteval auto getIndexTargets()
if (O2_BUILTIN_UNLIKELY(t == nullptr)) { \
o2::soa::dereferenceWithWrongType(#_Getter_, #_Table_); \
} \
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 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)); \
} \
} \
return result; \
} else { \
static_assert(o2::framework::always_static_assert_v<T>, "T is not a Filtered type"); \
} \
return {}; \
} \
\
auto _Getter_() const \
{ \
return _Getter_##_as<binding_t>(); \
Expand Down Expand Up @@ -3078,9 +3090,15 @@ 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(t->rawIteratorAt(i)); \
result.push_back(mBinding.get<T>()->rawIteratorAt(i)); \
} \
return result; \
} \
Expand Down
6 changes: 6 additions & 0 deletions 6 Framework/Core/include/Framework/AnalysisManagers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,12 @@ 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
Morty Proxy This is a proxified and sanitized view of the page, visit original site.