Skip to content

[ntuple] Fix recreation of streamer field with type alias #24014

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
jblomer merged 1 commit into from
Nov 6, 2026
Merged

[ntuple] Fix recreation of streamer field with type alias #24014

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
3 changes: 2 additions & 1 deletion tree/ntuple/src/RNTupleDescriptor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ std::unique_ptr<ROOT::RFieldBase>
ROOT::RFieldDescriptor::CreateField(const RNTupleDescriptor &ntplDesc, const ROOT::RCreateFieldOptions &options) const
{
if (GetStructure() == ROOT::ENTupleStructure::kStreamer) {
auto streamerField = std::make_unique<ROOT::RStreamerField>(GetFieldName(), GetTypeName());
const auto &typeName = GetTypeAlias().empty() ? GetTypeName() : GetTypeAlias();
auto streamerField = std::make_unique<ROOT::RStreamerField>(GetFieldName(), typeName);
if ((streamerField->GetTraits() & RFieldBase::kTraitEmulatedField) && !options.GetEmulateUnknownTypes()) {
throw RException(
R__FAIL("streamer field " + GetFieldName() + " has an emulated class but emulation is turned off"));
Expand Down
10 changes: 10 additions & 0 deletions tree/ntuple/test/StreamerField.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,14 @@ struct TemperatureKelvin {
float fValue;
};

template <typename T>
struct MEtoEDMStreamer {
T fMember;
};

template <typename T>
struct MEtoEDMClass {
T fMember;
};

#endif // ROOT_RNTuple_Test_StreamerField
3 changes: 3 additions & 0 deletions tree/ntuple/test/StreamerFieldLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@
#pragma link C++ options = rntupleStreamerMode(true) class TemperatureCelsius + ;
#pragma link C++ options = rntupleStreamerMode(true) class TemperatureKelvin + ;

#pragma link C++ options = rntupleStreamerMode(true) class MEtoEDMStreamer<long long>+;
#pragma link C++ class MEtoEDMClass<long long>+;

#endif
18 changes: 18 additions & 0 deletions tree/ntuple/test/rfield_streamer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,3 +407,21 @@ TEST(RField, StreamerClassMismatch)
false /* matchFullMessage */);
reader->LoadEntry(0);
}

TEST(RField, StreamerLong64TemplateArg)
{
FileRaii fileGuard("test_ntuple_rfield_streamer_long64_template_arg.root");
{
auto model = RNTupleModel::Create();
model->AddField(RFieldBase::Create("s", "MEtoEDMStreamer<Long64_t>").Unwrap());
model->AddField(RFieldBase::Create("c", "MEtoEDMClass<Long64_t>").Unwrap());
auto writer = RNTupleWriter::Recreate(std::move(model), "ntpl", fileGuard.GetPath());
writer->Fill();
}

auto reader = RNTupleReader::Open("ntpl", fileGuard.GetPath());
const auto &s = dynamic_cast<const ROOT::RStreamerField &>(reader->GetModel().GetConstField("s"));
EXPECT_STREQ("MEtoEDMStreamer<Long64_t>", s.GetClass()->GetName());
const auto &c = dynamic_cast<const ROOT::RClassField &>(reader->GetModel().GetConstField("c"));
EXPECT_STREQ("MEtoEDMClass<Long64_t>", c.GetClass()->GetName());
}
Loading