Merge 272083c into sapling-pr-archive-ktf

Author: ktf

Framework/Core/src/Plugin.cxx

@@ -222,21 +222,36 @@ struct RNTupleObjectReadingCapability : o2::framework::RootObjectReadingCapabili
   {
     auto context = new ImplementationContext;
 
-    return new RootObjectReadingCapability{
+    return new RootObjectReadingCapability
+    {
       .name = "rntuple",
-      .lfn2objectPath = [](std::string s) {
+      .lfn2objectPath = [](std::string s) -> std::string {
          std::replace(s.begin()+1, s.end(), '/', '-');
+#if __has_include(<ROOT/RFieldBase.hxx>)
+         if (s.starts_with("/")) {
+          return std::string(s.begin() + 1, s.end());
+        } else {
+          return s;
+        } },
+#else
          if (s.starts_with("/")) {
           return s;
         } else {
           return "/" + s;
         } },
+#endif
+#if __has_include(<ROOT/RFieldBase.hxx>)
+      .getHandle = getHandleByClass("ROOT::RNTuple"),
+      .checkSupport = matchClassByName("ROOT::RNTuple"),
+#else
       .getHandle = getHandleByClass("ROOT::Experimental::RNTuple"),
       .checkSupport = matchClassByName("ROOT::Experimental::RNTuple"),
+#endif
       .factory = [context]() -> RootArrowFactory& {
         lazyLoadFactory(context->implementations, "O2FrameworkAnalysisRNTupleSupport:RNTupleObjectReadingImplementation");
         return context->implementations.back();
-      }};
+      }
+    };
   }
 };
 

Framework/Core/test/test_Root2ArrowTable.cxx

@@ -73,7 +73,7 @@ TEST_CASE("RootTree2Fragment")
   /// A directory holding a tree
 
   /// Create a simple TTree
-  TBufferFile* file = new TBufferFile(TBuffer::kWrite);
+  auto* file = new TBufferFile(TBuffer::kWrite);
 
   TTree t1("t1", "a simple Tree with simple variables");
   Float_t xyz[3];
@@ -519,7 +519,7 @@ TEST_CASE("RootTree2Dataset")
     validateContents(batch);
   }
 
-  arrow::fs::FileLocator rnTupleLocator{outFs, "/rntuple"};
+  arrow::fs::FileLocator rnTupleLocator{outFs, "rntuple"};
   // We write an RNTuple in the same TMemFile, using /rntuple as a location
   auto rntupleDestination = std::dynamic_pointer_cast<TDirectoryFileOutputStream>(*destination);
 
@@ -530,7 +530,7 @@ TEST_CASE("RootTree2Dataset")
   }
 
   // And now we can read back the RNTuple into a RecordBatch
-  arrow::dataset::FileSource writtenRntupleSource("/rntuple", outFs);
+  arrow::dataset::FileSource writtenRntupleSource("rntuple", outFs);
 
   REQUIRE(rNtupleFormat->IsSupported(writtenRntupleSource) == true);