Resolve merge conflict (#245)

JuliaHEP · Apr 29, 2023 · 7f5b2e6 · 7f5b2e6
1 parent aaae1df
commit 7f5b2e6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/src/bootstrap.jl b/src/bootstrap.jl
@@ -1011,6 +1011,7 @@ function TNtuple(io, tkey::TKey, refs)
     tree = TTree(io, tkey, refs; top=false) #embeded tree
 end
 
+TNtupleD(io, tkey::TKey, refs) = TNtuple(io, tkey::TKey, refs)
 
 """
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -316,6 +316,12 @@ end
     close(rootfile)
 end
 
+@testset "TNtupleD" begin
+    ntupled = LazyTree(joinpath(SAMPLES_DIR, "TNtupleD.root"), "n1")
+    @test ntupled.x == [0.0, 1.0]
+    @test ntupled.y == [0.0, 1.0]
+end
+
 @testset "Singly jagged branches" begin
     # 32bits T
     rootfile = ROOTFile(joinpath(SAMPLES_DIR, "tree_with_jagged_array.root"))

diff --git a/test/samples/TNtupleD.py b/test/samples/TNtupleD.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+import ROOT
+
+t = ROOT.TNtupleD('n1', '', 'x:y')
+t.Fill(0.0, 0.0)
+t.Fill(1.0, 1.0)
+
+f = ROOT.TFile('TNtupleD.root', 'recreate')
+t.Write()
+f.Close()
+
diff --git a/test/samples/TNtupleD.root b/test/samples/TNtupleD.root
-Original file line number
+Diff line change
@@ Expand Up / @@ -1011,6 +1011,7 @@ function TNtuple(io, tkey::TKey, refs) @@
         tree = TTree(io, tkey, refs; top=false) #embeded tree
     end
+    TNtupleD(io, tkey::TKey, refs) = TNtuple(io, tkey::TKey, refs)
     """
@@ Expand Down @@