From 22fb187116d05a5d797adce865a7d6c0b1ea93c6 Mon Sep 17 00:00:00 2001 From: Jakob Blomer Date: Thu, 30 Jan 2025 11:50:51 +0100 Subject: [PATCH] [ntuple] fix option name in read options --- tree/ntuple/v7/inc/ROOT/RNTupleReadOptions.hxx | 4 ++-- tree/ntuple/v7/inc/ROOT/RNTupleReader.hxx | 2 +- tree/ntuple/v7/src/RNTupleReader.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tree/ntuple/v7/inc/ROOT/RNTupleReadOptions.hxx b/tree/ntuple/v7/inc/ROOT/RNTupleReadOptions.hxx index 1c13f0e3d52ee..5ccf6989b88fd 100644 --- a/tree/ntuple/v7/inc/ROOT/RNTupleReadOptions.hxx +++ b/tree/ntuple/v7/inc/ROOT/RNTupleReadOptions.hxx @@ -75,8 +75,8 @@ public: EImplicitMT GetUseImplicitMT() const { return fUseImplicitMT; } void SetUseImplicitMT(EImplicitMT val) { fUseImplicitMT = val; } - bool HasMetricsEnabled() const { return fEnableMetrics; } - void SetMetricsEnabled(bool enable) { fEnableMetrics = enable; } + bool GetEnableMetrics() const { return fEnableMetrics; } + void SetEnableMetrics(bool val) { fEnableMetrics = val; } }; // class RNTupleReadOptions namespace Internal { diff --git a/tree/ntuple/v7/inc/ROOT/RNTupleReader.hxx b/tree/ntuple/v7/inc/ROOT/RNTupleReader.hxx index c9ee0a5d0e5dd..e0505a0132e6e 100644 --- a/tree/ntuple/v7/inc/ROOT/RNTupleReader.hxx +++ b/tree/ntuple/v7/inc/ROOT/RNTupleReader.hxx @@ -173,7 +173,7 @@ public: std::unique_ptr Clone() { auto options = RNTupleReadOptions{}; - options.SetMetricsEnabled(fMetrics.IsEnabled()); + options.SetEnableMetrics(fMetrics.IsEnabled()); return std::unique_ptr(new RNTupleReader(fSource->Clone(), options)); } ~RNTupleReader(); diff --git a/tree/ntuple/v7/src/RNTupleReader.cxx b/tree/ntuple/v7/src/RNTupleReader.cxx index d60b2ac94517f..fabc8a3fe7e99 100644 --- a/tree/ntuple/v7/src/RNTupleReader.cxx +++ b/tree/ntuple/v7/src/RNTupleReader.cxx @@ -68,7 +68,7 @@ ROOT::Experimental::RNTupleReader::RNTupleReader(std::unique_ptrFreeze(); - InitPageSource(options.HasMetricsEnabled()); + InitPageSource(options.GetEnableMetrics()); ConnectModel(*fModel); } @@ -76,7 +76,7 @@ ROOT::Experimental::RNTupleReader::RNTupleReader(std::unique_ptr