From e893dbbd7caed7ed0f1a61114f1fd6406eaa100c Mon Sep 17 00:00:00 2001 From: Jakob Blomer Date: Thu, 22 Oct 2026 21:48:08 +0200 Subject: [PATCH] [ntuple] fix emulatation of SoA fields Emulated SoA fields should have the SoA trait set so that during merging the output field preserves the flag. --- tree/ntuple/src/RFieldSequenceContainer.cxx | 2 ++ tree/ntuple/test/ntuple_emulated.cxx | 1 + 2 files changed, 3 insertions(+) diff --git a/tree/ntuple/src/RFieldSequenceContainer.cxx b/tree/ntuple/src/RFieldSequenceContainer.cxx index 709ee762e6d06..782636921859c 100644 --- a/tree/ntuple/src/RFieldSequenceContainer.cxx +++ b/tree/ntuple/src/RFieldSequenceContainer.cxx @@ -543,6 +543,8 @@ ROOT::RVectorField::RVectorField(std::string_view fieldName, std::unique_ptrGetTypeName().empty()) { fTraits |= kTraitEmulatedField; + if (emulatedFrom->IsSoACollection()) + fTraits |= kTraitSoACollection; fEmulatedTypeVersion = emulatedFrom->GetTypeVersion(); fEmulatedTypeChecksum = emulatedFrom->GetTypeChecksum().value_or(0); } diff --git a/tree/ntuple/test/ntuple_emulated.cxx b/tree/ntuple/test/ntuple_emulated.cxx index 4a2cbd7416d2c..6cdd7fa4f7a03 100644 --- a/tree/ntuple/test/ntuple_emulated.cxx +++ b/tree/ntuple/test/ntuple_emulated.cxx @@ -984,6 +984,7 @@ TEST(RNTupleEmulated, EmulatedFields_SoA) const auto &soa = model->GetConstField("f"); EXPECT_EQ(soa.GetTypeName(), "EmulatedSoA"); EXPECT_TRUE(soa.GetTraits() & ROOT::RFieldBase::kTraitEmulatedField); + EXPECT_TRUE(soa.GetTraits() & ROOT::RFieldBase::kTraitSoACollection); EXPECT_EQ(soa.GetStructure(), ROOT::ENTupleStructure::kCollection); const auto children = soa.GetConstSubfields();