[ntuple] RNTupleReader moved out of Experimental

Author: silverweed

root/io/hadd/hadd_check_cms.C

@@ -1,19 +1,18 @@
 int hadd_check_cms(const char *merged, const char *reference)
 {
-  using namespace ROOT::Experimental;
+   auto mergedNtpl = ROOT::RNTupleReader::Open("Events", merged);
+   auto refNtpl = ROOT::RNTupleReader::Open("Events", reference);
 
-  auto mergedNtpl = RNTupleReader::Open("Events", merged);
-  auto refNtpl = RNTupleReader::Open("Events", reference);
+   const auto &mergedDesc = mergedNtpl->GetDescriptor();
+   const auto &refDesc = refNtpl->GetDescriptor();
 
-  const auto &mergedDesc = mergedNtpl->GetDescriptor();
-  const auto &refDesc = refNtpl->GetDescriptor();
-
-  struct Defer {
-    ~Defer() {
-      gSystem->Unlink(merg);
-      gSystem->Unlink(ref);
-    }
-    const char *merg, *ref;
+   struct Defer {
+      ~Defer()
+      {
+         gSystem->Unlink(merg);
+         gSystem->Unlink(ref);
+      }
+      const char *merg, *ref;
   } defer { merged, reference };
 
   if (mergedDesc.GetNEntries() != refDesc.GetNEntries()) {

root/io/hadd/merge_changeComp_check_output.C

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

root/io/hadd/merge_gen_input_tuples.C

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

root/ntuple/basics.C

@@ -10,8 +10,6 @@
 
 void basics()
 {
-   using ROOT::Experimental::RNTupleReader;
-
    const std::string kFileName{"test_rntuple_basics.root"s};
 
    {
@@ -21,7 +19,7 @@ void basics()
       writer->Fill();
    }
 
-   auto reader = RNTupleReader::Open("ntpl", kFileName);
+   auto reader = ROOT::RNTupleReader::Open("ntpl", kFileName);
    reader->Show(0);
 
    gSystem->Unlink(kFileName.c_str());

root/ntuple/makeproject/rntuple/read_rntuple.cxx

@@ -3,8 +3,6 @@
 #include "librntuplestltest/MySTLEvent.h"
 #include "gtest/gtest.h"
 
-using RNTupleReader = ROOT::Experimental::RNTupleReader;
-
 void check_bitset(const std::bitset<16> &a, const std::bitset<16> &b)
 {
    EXPECT_EQ(a, b);
@@ -36,7 +34,7 @@ void check_unordered_multimap(const std::unordered_multimap<std::string, std::ve
 
 TEST(RNTupleMakeProject, ReadBackRNTuple)
 {
-   auto ntuple = RNTupleReader::Open("events", "ntuple_makeproject_stl_example_rntuple.root");
+   auto ntuple = ROOT::RNTupleReader::Open("events", "ntuple_makeproject_stl_example_rntuple.root");
 
 #ifdef _MSC_VER
    // The Microsoft linker uses an optimization such that a library is not going