Merge pull request #109 from aminnj/issue108

JuliaHEP · Sep 16, 2021 · 635ed0e · 635ed0e · aminnj · Sep 16, 2021
2 parents faea58a + 7bcc0c1
commit 635ed0e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "UnROOT"
 uuid = "3cd96dde-e98d-4713-81e9-a4a1b0235ce9"
 authors = ["Tamas Gal", "Jerry Ling", "Johannes Schumann", "Nick Amin"]
-version = "0.6.1"
+version = "0.6.2"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

diff --git a/src/root.jl b/src/root.jl
@@ -365,6 +365,10 @@ function auto_T_JaggT(f::ROOTFile, branch; customstructs::Dict{String, Type})
                     UInt32
                 elseif elname == "unsigned char" 
                     Char
+                elseif elname == "unsigned short"
+                    UInt16
+                elseif elname == "ulong64"
+                    UInt64
                 else
                     _type = getfield(Base, Symbol(:C, elname))
                 end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -536,6 +536,14 @@ end
     _ = length.(arr);
     @test length.(arr.buffer) == length.(arr.buffer_range)
     close(rootfile)
+
+    # issue 108
+    # unsigned short -> Int16, ulong64 -> UInt64
+    # file minified with `rooteventselector --recreate -l 2 "trackntuple.root:trackingNtuple/tree" issue108_small.root`
+    rootfile = ROOTFile(joinpath(SAMPLES_DIR, "issue108_small.root"))
+    @test rootfile["tree/trk_algoMask"][2] == [0x0000000000004000, 0x0000000000004000, 0x0000000000004000, 0x0000000000004000]
+    @test rootfile["tree/pix_ladder"][3][1:5] == UInt16[0x0001, 0x0001, 0x0001, 0x0001, 0x0003]
+    close(rootfile)
 end
 
 @testset "jagged subbranch type by leaf" begin

diff --git a/test/samples/issue108_small.root b/test/samples/issue108_small.root