Skip to content

[ROOT6] RNTuple API change: RNTupleWriter is private #43949

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
cmsbuild merged 1 commit into from
Feb 18, 2024
Merged

[ROOT6] RNTuple API change: RNTupleWriter is private #43949

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
10 changes: 7 additions & 3 deletions PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@
#include <ROOT/RPageStorageFile.hxx>
using ROOT::Experimental::RNTupleModel;
using ROOT::Experimental::RNTupleWriteOptions;
using ROOT::Experimental::RNTupleWriter;
using ROOT::Experimental::Detail::RPageSinkFile;
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
using ROOT::Experimental::RNTupleWriter;
#define MakeRNTupleWriter std::make_unique<RNTupleWriter>
#else
#define MakeRNTupleWriter ROOT::Experimental::Internal::CreateRNTupleWriter
#endif

#include "TObjString.h"

Expand Down Expand Up @@ -206,8 +211,7 @@ void NanoAODRNTupleOutputModule::initializeNTuple(edm::EventForOutput const& iEv
// TODO use Append
RNTupleWriteOptions options;
options.SetCompression(m_file->GetCompressionSettings());
m_ntuple =
std::make_unique<RNTupleWriter>(std::move(model), std::make_unique<RPageSinkFile>("Events", *m_file, options));
m_ntuple = MakeRNTupleWriter(std::move(model), std::make_unique<RPageSinkFile>("Events", *m_file, options));
}

void NanoAODRNTupleOutputModule::write(edm::EventForOutput const& iEvent) {
Expand Down
20 changes: 12 additions & 8 deletions PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@
#include <ROOT/RPageStorageFile.hxx>
using ROOT::Experimental::RNTupleModel;
using ROOT::Experimental::RNTupleWriteOptions;
using ROOT::Experimental::RNTupleWriter;
using ROOT::Experimental::Detail::RPageSinkFile;
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
using ROOT::Experimental::RNTupleWriter;
#define MakeRNTupleWriter std::make_unique<RNTupleWriter>
#else
#define MakeRNTupleWriter ROOT::Experimental::Internal::CreateRNTupleWriter
#endif

#include "RNTupleFieldPtr.h"
#include "SummaryTableOutputFields.h"
Expand All @@ -23,8 +28,7 @@ void LumiNTuple::createFields(const edm::LuminosityBlockID& id, TFile& file) {
// m_ntuple = RNTupleWriter::Append(std::move(model), "LuminosityBlocks", file);
RNTupleWriteOptions options;
options.SetCompression(file.GetCompressionSettings());
m_ntuple = std::make_unique<RNTupleWriter>(std::move(model),
std::make_unique<RPageSinkFile>("LuminosityBlocks", file, options));
m_ntuple = MakeRNTupleWriter(std::move(model), std::make_unique<RPageSinkFile>("LuminosityBlocks", file, options));
}

void LumiNTuple::fill(const edm::LuminosityBlockID& id, TFile& file) {
Expand Down Expand Up @@ -54,7 +58,7 @@ void RunNTuple::createFields(const edm::RunForOutput& iRun, TFile& file) {
// TODO use Append when we bump our RNTuple version
RNTupleWriteOptions options;
options.SetCompression(file.GetCompressionSettings());
m_ntuple = std::make_unique<RNTupleWriter>(std::move(model), std::make_unique<RPageSinkFile>("Runs", file, options));
m_ntuple = MakeRNTupleWriter(std::move(model), std::make_unique<RPageSinkFile>("Runs", file, options));
}

void RunNTuple::fill(const edm::RunForOutput& iRun, TFile& file) {
Expand Down Expand Up @@ -83,8 +87,8 @@ void PSetNTuple::createFields(TFile& file) {
// TODO use Append when we bump our RNTuple version
RNTupleWriteOptions options;
options.SetCompression(file.GetCompressionSettings());
m_ntuple = std::make_unique<RNTupleWriter>(
std::move(model), std::make_unique<RPageSinkFile>(edm::poolNames::parameterSetsTreeName(), file, options));
m_ntuple = MakeRNTupleWriter(std::move(model),
std::make_unique<RPageSinkFile>(edm::poolNames::parameterSetsTreeName(), file, options));
}

void PSetNTuple::fill(edm::pset::Registry* pset, TFile& file) {
Expand Down Expand Up @@ -115,8 +119,8 @@ void MetadataNTuple::createFields(TFile& file) {
m_procHist = model->MakeCollection(edm::poolNames::processHistoryBranchName(), std::move(procHistModel));
RNTupleWriteOptions options;
options.SetCompression(file.GetCompressionSettings());
m_ntuple = std::make_unique<RNTupleWriter>(
std::move(model), std::make_unique<RPageSinkFile>(edm::poolNames::metaDataTreeName(), file, options));
m_ntuple = MakeRNTupleWriter(std::move(model),
std::make_unique<RPageSinkFile>(edm::poolNames::metaDataTreeName(), file, options));
}

void MetadataNTuple::fill(const edm::ProcessHistoryRegistry& procHist, TFile& file) {
Expand Down