change Switch from 64 bits to 96 bits and update the Cardinality test…

… sample
JuliaHEP · Jan 19, 2024 · d6ee392 · d6ee392
1 parent fdf23d4
commit d6ee392
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/RNTuple/constants.jl b/src/RNTuple/constants.jl
@@ -1,5 +1,5 @@
 # the signed ones are not used
-@define_integers 64 SignedSwitch Switch
+@define_integers 96 SignedSwitch Switch
 @define_integers 32 SignedIndex32 Index32
 @define_integers 64 SignedIndex64 Index64
 
@@ -38,7 +38,7 @@ const rntuple_col_type_dict = (
 const rntuple_col_nbits_dict = (
     64,
     32,
-    64, # Switch
+    96, # Switch
     8,
     8,  # char
     1,   # it's actually `Bit` in ROOT, there's no byte in RNTuple spec

diff --git a/src/RNTuple/fieldcolumn_reading.jl b/src/RNTuple/fieldcolumn_reading.jl
@@ -150,7 +150,7 @@ end
 
 struct UnionVector{T, N} <: AbstractVector{T}
     kindex::Vector{UInt64}
-    tag::Vector{Int8}
+    tag::Vector{Int32}
     contents::N
     function UnionVector(kindex, tag, contents::N) where N
         T = Union{eltype.(contents)...}
@@ -167,8 +167,8 @@ function Base.getindex(ary::UnionVector, i::Int)
 end
 
 function _split_switch_bits(content)
-    kindex = content .& 0x00000000000FFFFF .+ 1
-    tags = Int8.(content .>> 44)
+    kindex = content .& (typemax(UInt128) >> 64) .+ 1
+    tags = Int32.(content .>> 64)
     return kindex, tags
 end
 function _field_output_type(::Type{UnionField{S, T}}) where {S, T}

diff --git a/test/samples/RNTuple/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root b/test/samples/RNTuple/Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root
diff --git a/test/samples/RNTuple/importer.cc b/test/samples/RNTuple/importer.cc
@@ -1,4 +1,4 @@
-root [0] auto importer = ROOT::Experimental::RNTupleImporter::Create("./Run2012BC_DoubleMuParked_Muons.root", "Events", "./limit.root");
+root [0] auto importer = ROOT::Experimental::RNTupleImporter::Create("./Run2012BC_DoubleMuParked_Muons.root", "Events", "./Run2012BC_DoubleMuParked_Muons_rntuple_1000evts.root");
 root [2] auto c = importer.get();
 root [4] c->SetMaxEntries(1000);
 root [5] c->Import()