Skip to content

Please consider the following formatting changes to #14284 #96

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
aalkin merged 1 commit into from
May 16, 2025
Merged

Please consider the following formatting changes to #14284 #96

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
47 changes: 27 additions & 20 deletions Framework/Core/include/Framework/ASoA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ concept has_index = (is_indexing_column<C> || ...);
template <typename T, typename... Cs>
consteval auto inBindings(framework::pack<Cs...>)
{
return framework::has_type_at_v<T>(framework::pack<decltype([]<typename C>(){
return framework::has_type_at_v<T>(framework::pack<decltype([]<typename C>() {
if constexpr (is_index_column<C> && !is_self_index_column<C>) {
return std::declval<typename C::binding_t>();
} else {
Expand Down Expand Up @@ -1149,37 +1149,39 @@ struct TableIterator : IP, C... {

std::vector<o2::soa::Binding> getIndexBindings() const
{
return {[this]<soa::is_column CL>(){
return { [this]<soa::is_column CL>() {
if constexpr (soa::is_index_column<CL> && !soa::is_self_index_column<CL>) {
return o2::soa::Binding{CL::getCurrentRaw()};
} else {
return o2::soa::Binding{};
}
}.template operator()<C>()...};
}.template operator()<C>()... };
}

template <typename... TA>
void bindExternalIndices(TA*... current)
{
([this]<typename... Cs, typename TT>(framework::pack<Cs...>, TT* t) {
([this]<soa::is_column CL, typename TI>(TI* c){
([this]<soa::is_column CL, typename TI>(TI* c) {
if constexpr (soa::is_index_column<CL> && !soa::is_self_index_column<CL>) {
CL::setCurrent(c);
}
}.template operator()<Cs, TT>(t), ...);
}.template operator()<Cs, TT>(t),
...);
}(framework::pack<C...>{}, current),
...);
}

void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& bindings)
{
[&bindings, this]<size_t... Is>(std::index_sequence<Is...>){
([&bindings, this](){
[&bindings, this]<size_t... Is>(std::index_sequence<Is...>) {
([&bindings, this]() {
using column = typename framework::pack_element_t<Is, framework::pack<C...>>;
if constexpr (soa::is_index_column<column> && !soa::is_self_index_column<column>) {
column::setCurrentRaw(bindings[Is]);
}
}(), ...);
}(),
...);
}(std::make_index_sequence<sizeof...(C)>());
}

Expand All @@ -1188,11 +1190,12 @@ struct TableIterator : IP, C... {
{
o2::soa::Binding b;
b.bind(table);
([this]<soa::is_column CL>(o2::soa::Binding const& bb){
if constexpr(soa::is_self_index_column<CL>) {
([this]<soa::is_column CL>(o2::soa::Binding const& bb) {
if constexpr (soa::is_self_index_column<CL>) {
CL::setCurrentRaw(bb);
}
}.template operator()<C>(b), ...);
}.template operator()<C>(b),
...);
}

private:
Expand All @@ -1208,13 +1211,14 @@ struct TableIterator : IP, C... {
void bind()
{
using namespace o2::soa;
([this]<soa::is_column CL>(){
([this]<soa::is_column CL>() {
if constexpr (soa::is_persistent_column<CL>) {
CL::mColumnIterator.mCurrentPos = &this->mRowIndex;
} else if constexpr (soa::is_dynamic_column<CL>) {
bindDynamicColumn<CL>(typename CL::bindings_t{});
}
}.template operator()<C>(), ...);
}.template operator()<C>(),
...);

if constexpr (has_index<C...>) {
this->setIndices(this->getIndices());
Expand All @@ -1230,7 +1234,7 @@ struct TableIterator : IP, C... {
template <typename DC, typename... B>
auto bindDynamicColumn(framework::pack<B...>)
{
DC::boundIterators = std::make_tuple([this]<typename Bi>(){
DC::boundIterators = std::make_tuple([this]<typename Bi>() {
if constexpr (can_bind<self_t, Bi>) {
return &(static_cast<B*>(this)->mColumnIterator);
} else {
Expand Down Expand Up @@ -1369,25 +1373,27 @@ static constexpr std::string getLabelFromTypeForKey(std::string const& key)
template <typename B, typename... C>
consteval static bool hasIndexTo(framework::pack<C...>&&)
{
return ([]<soa::is_column CC, typename BB>(){
return ([]<soa::is_column CC, typename BB>() {
if constexpr (soa::is_index_column<CC> && !soa::is_self_index_column<CC>) {
return o2::soa::is_binding_compatible_v<BB, typename CC::binding_t>();
} else {
return false;
}
}.template operator()<C, B>() || ...);
}.template operator()<C, B>() ||
...);
}

template <typename B, typename... C>
consteval static bool hasSortedIndexTo(framework::pack<C...>&&)
{
return ([]<soa::is_column CC, typename BB>(){
return ([]<soa::is_column CC, typename BB>() {
if constexpr (soa::is_index_column<CC> && !soa::is_self_index_column<CC>) {
return CC::sorted && o2::soa::is_binding_compatible_v<B, typename CC::binding_t>();
} else {
return false;
}
}.template operator()<C, B>() || ...);
}.template operator()<C, B>() ||
...);
}

template <typename B, typename Z>
Expand Down Expand Up @@ -2059,11 +2065,12 @@ class Table
template <typename... Cs>
void doBindInternalIndicesExplicit(framework::pack<Cs...>, o2::soa::Binding binding)
{
([this]<soa::is_column CL>(o2::soa::Binding b){
([this]<soa::is_column CL>(o2::soa::Binding b) {
if constexpr (soa::is_self_index_column<CL>) {
static_cast<CL>(mBegin).setCurrentRaw(b);
}
}.template operator()<Cs>(binding), ...);
}.template operator()<Cs>(binding),
...);
}

void bindExternalIndicesRaw(std::vector<o2::soa::Binding>&& ptrs)
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/include/Framework/GroupedCombinations.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ auto interleaveTuples(std::tuple<T1s...>& t1, std::tuple<T2s...>& t2)
}

template <typename T, typename G>
using is_index_to_g_t = decltype([](){
using is_index_to_g_t = decltype([]() {
if constexpr (soa::is_index_column<T> && !soa::is_self_index_column<T>) {
return std::conditional_t<o2::soa::is_binding_compatible_v<std::decay_t<G>, typename std::decay_t<T>::binding_t>(), std::true_type, std::false_type>{};
} else {
Expand Down