Skip to content

Commit b88a36f

Browse files
committed
[ntuple] RNTupleWriter moved out of Experimental
1 parent a906d39 commit b88a36f

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

root/io/hadd/hadd_gen_input_files.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void hadd_gen_input_files(const char *fnamePrefix = "hadd_input")
2424
if (i > 1) {
2525
auto model = ROOT::RNTupleModel::Create();
2626
auto p = model->MakeField<char>("c");
27-
auto writer = RNTupleWriter::Append(std::move(model), "ntpl", *file);
27+
auto writer = ROOT::RNTupleWriter::Append(std::move(model), "ntpl", *file);
2828
*p = 22;
2929
writer->Fill();
3030

root/io/hadd/merge_gen_input_tuples.C

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void merge_gen_input_tuples(const char *fname1 = "test_rntuple_input1.root", con
2020
auto fl = model->MakeField<long>("L");
2121
auto opts = ROOT::RNTupleWriteOptions{};
2222
opts.SetCompression(ROOT::CompressionSettings(ROOT::RCompressionSetting::EAlgorithm::kZSTD, 5));
23-
auto writer = RNTupleWriter::Recreate(std::move(model), "ntpl", fname1, opts);
23+
auto writer = ROOT::RNTupleWriter::Recreate(std::move(model), "ntpl", fname1, opts);
2424
for (int i = 0; i < 1000; ++i) {
2525
*fi = i;
2626
*fl = i;
@@ -33,7 +33,7 @@ void merge_gen_input_tuples(const char *fname1 = "test_rntuple_input1.root", con
3333
auto fl = model->MakeField<long>("L");
3434
auto opts = ROOT::RNTupleWriteOptions{};
3535
opts.SetCompression(ROOT::CompressionSettings(ROOT::RCompressionSetting::EAlgorithm::kZLIB, 1));
36-
auto writer = RNTupleWriter::Recreate(std::move(model), "ntpl", fname2, opts);
36+
auto writer = ROOT::RNTupleWriter::Recreate(std::move(model), "ntpl", fname2, opts);
3737
for (int i = 0; i < 100; ++i) {
3838
*fi = i;
3939
*fl = i;

root/ntuple/basics.C

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010

1111
void basics()
1212
{
13-
using ROOT::Experimental::RNTupleWriter;
1413
using ROOT::Experimental::RNTupleReader;
1514

1615
const std::string kFileName{"test_rntuple_basics.root"s};
1716

1817
{
1918
auto model = ROOT::RNTupleModel::Create();
2019
*model->MakeField<int>("E") = 137;
21-
auto writer = RNTupleWriter::Recreate(std::move(model), "ntpl", kFileName);
20+
auto writer = ROOT::RNTupleWriter::Recreate(std::move(model), "ntpl", kFileName);
2221
writer->Fill();
2322
}
2423

root/ntuple/makeproject/rntuple/write_rntuple.cxx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
#include <ROOT/RNTupleModel.hxx>
33
#include <ROOT/RNTupleWriter.hxx>
44

5-
using RNTupleWriter = ROOT::Experimental::RNTupleWriter;
6-
75
int main()
86
{
97
auto model = ROOT::RNTupleModel::Create();
108
auto fldStlEvent = model->MakeField<MySTLEvent>("test");
119

12-
auto ntuple = RNTupleWriter::Recreate(std::move(model), "events", "ntuple_makeproject_stl_example_rntuple.root");
10+
auto ntuple =
11+
ROOT::RNTupleWriter::Recreate(std::move(model), "events", "ntuple_makeproject_stl_example_rntuple.root");
1312
ntuple->Fill();
1413
return 0;
1514
}

0 commit comments

Comments
 (0)