Skip to content

[ntuple][ATLAS experiment] Make RNTupleDescriptor RIterators usable… #22285

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

Open
rybkine wants to merge 3 commits into
base: master
Choose a base branch
from
+55 −36
Open

[ntuple][ATLAS experiment] Make RNTupleDescriptor RIterators usable… #22285

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
ccfb7a0
[ntuple][ATLAS experiment] Make RNTupleDescriptor `RIterator`s usable…
May 7, 2026
ef22133
[ntuple][ATLAS experiment] Simplify default constructor of RNTupleDes…
May 14, 2026
a3400b5
[ntuple][ATLAS experiment] Update TestFromTTree method of RDFSnapshot…
May 14, 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
3 changes: 2 additions & 1 deletion tree/dataframe/test/dataframe_snapshot_ntuple.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,8 @@ class RDFSnapshotRNTupleFromTTreeTest : public ::testing::Test {

auto &descriptor = reader->GetDescriptor();

int nTopLevelFields = std::distance(descriptor.GetTopLevelFields().begin(), descriptor.GetTopLevelFields().end());
auto topLevelFieldsIterable = descriptor.GetTopLevelFields();
int nTopLevelFields = std::distance(topLevelFieldsIterable.begin(), topLevelFieldsIterable.end());
EXPECT_EQ(9, nTopLevelFields);
EXPECT_EQ("std::int32_t", descriptor.GetFieldDescriptor(descriptor.FindFieldId("x")).GetTypeName());
EXPECT_EQ("float", descriptor.GetFieldDescriptor(descriptor.FindFieldId("pt")).GetTypeName());
Expand Down
88 changes: 53 additions & 35 deletions tree/ntuple/inc/ROOT/RNTupleDescriptor.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,8 @@ public:
using pointer = const RColumnRange *;
using reference = const RColumnRange &;

RIterator(Iter_t iter) : fIter(iter) {}
RIterator() = default;
explicit RIterator(Iter_t iter) : fIter(iter) {}
iterator &operator++() /* prefix */
{
++fIter;
Expand Down Expand Up @@ -953,22 +954,20 @@ private:
public:
class RIterator final {
private:
/// The enclosing range's RNTuple.
const RNTupleDescriptor &fNTuple;
/// The enclosing range's descriptor id list.
const std::vector<ROOT::DescriptorId_t> &fColumns;
std::size_t fIndex = 0;
/// The enclosing RColumnDescriptorIterable.
const RColumnDescriptorIterable *fIterable;
std::size_t fIndex;

public:
using iterator_category = std::forward_iterator_tag;
using iterator = RIterator;
using value_type = RFieldDescriptor;
using value_type = RColumnDescriptor;
using difference_type = std::ptrdiff_t;
using pointer = const RColumnDescriptor *;
using reference = const RColumnDescriptor &;

RIterator(const RNTupleDescriptor &ntuple, const std::vector<ROOT::DescriptorId_t> &columns, std::size_t index)
: fNTuple(ntuple), fColumns(columns), fIndex(index)
explicit RIterator(const RColumnDescriptorIterable *iterable = nullptr, std::size_t index = 0)
: fIterable(iterable), fIndex(index)
{
}
iterator &operator++() /* prefix */
Expand All @@ -982,17 +981,26 @@ public:
operator++();
return old;
}
reference operator*() const { return fNTuple.GetColumnDescriptor(fColumns.at(fIndex)); }
pointer operator->() const { return &fNTuple.GetColumnDescriptor(fColumns.at(fIndex)); }
bool operator!=(const iterator &rh) const { return fIndex != rh.fIndex; }
bool operator==(const iterator &rh) const { return fIndex == rh.fIndex; }
reference operator*() const
{
if (fIterable)
return fIterable->fNTuple.GetColumnDescriptor(fIterable->fColumns.at(fIndex));
throw RException(R__FAIL("dereference of RNTupleDescriptor::RColumnDescriptorIterable::RIterator"
" constructed without RNTupleDescriptor::RColumnDescriptorIterable"));
}
pointer operator->() const
{
return fIterable ? &fIterable->fNTuple.GetColumnDescriptor(fIterable->fColumns.at(fIndex)) : nullptr;
}
bool operator!=(const iterator &rh) const { return fIndex != rh.fIndex || fIterable != rh.fIterable; }
bool operator==(const iterator &rh) const { return fIndex == rh.fIndex && fIterable == rh.fIterable; }
};

RColumnDescriptorIterable(const RNTupleDescriptor &ntuple, const RFieldDescriptor &fieldDesc);
RColumnDescriptorIterable(const RNTupleDescriptor &ntuple);

RIterator begin() { return RIterator(fNTuple, fColumns, 0); }
RIterator end() { return RIterator(fNTuple, fColumns, fColumns.size()); }
RIterator begin() { return RIterator(this, 0); }
RIterator end() { return RIterator(this, fColumns.size()); }
size_t size() { return fColumns.size(); }
};

Expand All @@ -1014,11 +1022,9 @@ private:
public:
class RIterator final {
private:
/// The enclosing range's RNTuple.
const RNTupleDescriptor &fNTuple;
/// The enclosing range's descriptor id list.
const std::vector<ROOT::DescriptorId_t> &fFieldChildren;
std::size_t fIndex = 0;
/// The enclosing RFieldDescriptorIterable.
const RFieldDescriptorIterable *fIterable;
std::size_t fIndex;

public:
using iterator_category = std::forward_iterator_tag;
Expand All @@ -1028,9 +1034,8 @@ public:
using pointer = const RFieldDescriptor *;
using reference = const RFieldDescriptor &;

RIterator(const RNTupleDescriptor &ntuple, const std::vector<ROOT::DescriptorId_t> &fieldChildren,
std::size_t index)
: fNTuple(ntuple), fFieldChildren(fieldChildren), fIndex(index)
explicit RIterator(const RFieldDescriptorIterable *iterable = nullptr, std::size_t index = 0)
: fIterable(iterable), fIndex(index)
{
}
iterator &operator++() /* prefix */
Expand All @@ -1044,10 +1049,19 @@ public:
operator++();
return old;
}
reference operator*() const { return fNTuple.GetFieldDescriptor(fFieldChildren.at(fIndex)); }
pointer operator->() const { return &fNTuple.GetFieldDescriptor(fFieldChildren.at(fIndex)); }
bool operator!=(const iterator &rh) const { return fIndex != rh.fIndex; }
bool operator==(const iterator &rh) const { return fIndex == rh.fIndex; }
reference operator*() const
{
if (fIterable)
return fIterable->fNTuple.GetFieldDescriptor(fIterable->fFieldChildren.at(fIndex));
throw RException(R__FAIL("dereference of RNTupleDescriptor::RFieldDescriptorIterable::RIterator"
" constructed without RNTupleDescriptor::RFieldDescriptorIterable"));
}
pointer operator->() const
{
return fIterable ? &fIterable->fNTuple.GetFieldDescriptor(fIterable->fFieldChildren.at(fIndex)) : nullptr;
}
bool operator!=(const iterator &rh) const { return fIndex != rh.fIndex || fIterable != rh.fIterable; }
bool operator==(const iterator &rh) const { return fIndex == rh.fIndex && fIterable == rh.fIterable; }
};
RFieldDescriptorIterable(const RNTupleDescriptor &ntuple, const RFieldDescriptor &field)
: fNTuple(ntuple), fFieldChildren(field.GetLinkIds())
Expand All @@ -1060,8 +1074,8 @@ public:
{
std::sort(fFieldChildren.begin(), fFieldChildren.end(), comparator);
}
RIterator begin() { return RIterator(fNTuple, fFieldChildren, 0); }
RIterator end() { return RIterator(fNTuple, fFieldChildren, fFieldChildren.size()); }
RIterator begin() { return RIterator(this, 0); }
RIterator end() { return RIterator(this, fFieldChildren.size()); }
};

// clang-format off
Expand Down Expand Up @@ -1093,7 +1107,8 @@ public:
using pointer = const RClusterGroupDescriptor *;
using reference = const RClusterGroupDescriptor &;

RIterator(Iter_t iter) : fIter(iter) {}
RIterator() = default;
explicit RIterator(Iter_t iter) : fIter(iter) {}
iterator &operator++() /* prefix */
{
++fIter;
Expand Down Expand Up @@ -1147,7 +1162,8 @@ public:
using pointer = const RClusterDescriptor *;
using reference = const RClusterDescriptor &;

RIterator(Iter_t iter) : fIter(iter) {}
RIterator() = default;
explicit RIterator(Iter_t iter) : fIter(iter) {}
iterator &operator++() /* prefix */
{
++fIter;
Expand Down Expand Up @@ -1197,7 +1213,8 @@ public:
using pointer = const RExtraTypeInfoDescriptor *;
using reference = const RExtraTypeInfoDescriptor &;

RIterator(Iter_t iter) : fIter(iter) {}
RIterator() = default;
explicit RIterator(Iter_t iter) : fIter(iter) {}
iterator &operator++() /* prefix */
{
++fIter;
Expand All @@ -1210,7 +1227,7 @@ public:
return old;
}
reference operator*() const { return *fIter; }
pointer operator->() const { return &*fIter; }
pointer operator->() const { return fIter.operator->(); }
bool operator!=(const iterator &rh) const { return fIter != rh.fIter; }
bool operator==(const iterator &rh) const { return fIter == rh.fIter; }
};
Expand Down Expand Up @@ -1249,7 +1266,8 @@ public:
using pointer = const value_type *;
using reference = const value_type &;

RIterator(Iter_t iter) : fIter(iter) {}
RIterator() = default;
explicit RIterator(Iter_t iter) : fIter(iter) {}
iterator &operator++() /* prefix */
{
++fIter;
Expand All @@ -1262,7 +1280,7 @@ public:
return old;
}
reference operator*() const { return *fIter; }
pointer operator->() const { return &*fIter; }
pointer operator->() const { return fIter.operator->(); }
bool operator!=(const iterator &rh) const { return fIter != rh.fIter; }
bool operator==(const iterator &rh) const { return fIter == rh.fIter; }
};
Expand Down
Loading