Skip to content

Commit 990597b

Browse files
committed
[ntuple] Remove RNTupleOpenSpec constructor argument
1 parent 8e8fb53 commit 990597b

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

tree/ntuple/v7/inc/ROOT/RNTupleProcessor.hxx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,7 @@ protected:
168168
///
169169
/// \note Before processing, a model *must* exist. However, this is handled downstream by the RNTupleProcessor's
170170
/// factory functions (CreateSingle, CreateChain and CreateJoin) and constructors.
171-
RNTupleProcessor(const std::vector<RNTupleOpenSpec> &ntuples, std::unique_ptr<RNTupleModel> model)
172-
: fNTuples(ntuples), fModel(std::move(model))
173-
{
174-
}
171+
RNTupleProcessor(std::unique_ptr<RNTupleModel> model) : fModel(std::move(model)) {}
175172

176173
public:
177174
RNTupleProcessor(const RNTupleProcessor &) = delete;

tree/ntuple/v7/src/RNTupleProcessor.cxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void ROOT::Experimental::RNTupleProcessor::ConnectField(RFieldContext &fieldCont
145145

146146
ROOT::Experimental::RNTupleSingleProcessor::RNTupleSingleProcessor(const RNTupleOpenSpec &ntuple,
147147
std::unique_ptr<RNTupleModel> model)
148-
: RNTupleProcessor({ntuple}, std::move(model)), fNTupleSpec(ntuple)
148+
: RNTupleProcessor(std::move(model)), fNTupleSpec(ntuple)
149149
{
150150
if (!fModel) {
151151
fPageSource = Internal::RPageSource::Create(fNTupleSpec.fNTupleName, fNTupleSpec.fStorage);
@@ -217,7 +217,7 @@ void ROOT::Experimental::RNTupleSingleProcessor::Connect()
217217

218218
ROOT::Experimental::RNTupleChainProcessor::RNTupleChainProcessor(
219219
std::vector<std::unique_ptr<RNTupleProcessor>> processors, std::unique_ptr<RNTupleModel> model)
220-
: RNTupleProcessor({}, std::move(model)), fInnerProcessors(std::move(processors))
220+
: RNTupleProcessor(std::move(model)), fInnerProcessors(std::move(processors))
221221
{
222222
fInnerNEntries.assign(fInnerProcessors.size(), kInvalidNTupleIndex);
223223

@@ -304,8 +304,9 @@ ROOT::NTupleSize_t ROOT::Experimental::RNTupleChainProcessor::LoadEntry(ROOT::NT
304304

305305
ROOT::Experimental::RNTupleJoinProcessor::RNTupleJoinProcessor(const RNTupleOpenSpec &mainNTuple,
306306
std::unique_ptr<RNTupleModel> model)
307-
: RNTupleProcessor({mainNTuple}, nullptr)
307+
: RNTupleProcessor(nullptr)
308308
{
309+
fNTuples.emplace_back(mainNTuple);
309310
fPageSource = Internal::RPageSource::Create(mainNTuple.fNTupleName, mainNTuple.fStorage);
310311
fPageSource->Attach();
311312

0 commit comments

Comments
 (0)