[ntuple] RNTupleModel move out of Experimental

Author: silverweed

root/io/hadd/hadd_gen_input_files.C

@@ -22,7 +22,7 @@ void hadd_gen_input_files(const char *fnamePrefix = "hadd_input")
          h.Write();
       }
       if (i > 1) {
-         auto model = RNTupleModel::Create();
+         auto model = ROOT::RNTupleModel::Create();
          auto p = model->MakeField<char>("c");
          auto writer = RNTupleWriter::Append(std::move(model), "ntpl", *file);
          *p = 22;

root/io/hadd/merge_changeComp_check_output.C

@@ -1,5 +1,4 @@
 #include <ROOT/RLogger.hxx>
-#include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleReader.hxx>
 #include <ROOT/RNTupleWriter.hxx>
 #include <ROOT/RPageStorageFile.hxx>

root/io/hadd/merge_gen_input_tuples.C

@@ -15,7 +15,7 @@ void merge_gen_input_tuples(const char *fname1 = "test_rntuple_input1.root", con
    using namespace ROOT::Experimental;
 
    {
-      auto model = RNTupleModel::Create();
+      auto model = ROOT::RNTupleModel::Create();
       auto fi = model->MakeField<int>("I");
       auto fl = model->MakeField<long>("L");
       auto opts = ROOT::RNTupleWriteOptions{};
@@ -28,7 +28,7 @@ void merge_gen_input_tuples(const char *fname1 = "test_rntuple_input1.root", con
       }
    }
    {
-      auto model = RNTupleModel::Create();
+      auto model = ROOT::RNTupleModel::Create();
       auto fi = model->MakeField<int>("I");
       auto fl = model->MakeField<long>("L");
       auto opts = ROOT::RNTupleWriteOptions{};

root/ntuple/basics.C

@@ -10,14 +10,13 @@
 
 void basics()
 {
-   using ROOT::Experimental::RNTupleModel;
    using ROOT::Experimental::RNTupleWriter;
    using ROOT::Experimental::RNTupleReader;
 
    const std::string kFileName{"test_rntuple_basics.root"s};
 
    {
-      auto model = RNTupleModel::Create();
+      auto model = ROOT::RNTupleModel::Create();
       *model->MakeField<int>("E") = 137;
       auto writer = RNTupleWriter::Recreate(std::move(model), "ntpl", kFileName);
       writer->Fill();

root/ntuple/makeproject/rntuple/read_rntuple.cxx

@@ -3,7 +3,6 @@
 #include "librntuplestltest/MySTLEvent.h"
 #include "gtest/gtest.h"
 
-using RNTupleModel = ROOT::Experimental::RNTupleModel;
 using RNTupleReader = ROOT::Experimental::RNTupleReader;
 
 void check_bitset(const std::bitset<16> &a, const std::bitset<16> &b)

root/ntuple/makeproject/rntuple/write_rntuple.cxx

@@ -2,12 +2,11 @@
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleWriter.hxx>
 
-using RNTupleModel = ROOT::Experimental::RNTupleModel;
 using RNTupleWriter = ROOT::Experimental::RNTupleWriter;
 
 int main()
 {
-   auto model = RNTupleModel::Create();
+   auto model = ROOT::RNTupleModel::Create();
    auto fldStlEvent = model->MakeField<MySTLEvent>("test");
 
    auto ntuple = RNTupleWriter::Recreate(std::move(model), "events", "ntuple_makeproject_stl_example_rntuple.root");