fix: add support for new RNTuple switches (#1218)

* Fix handling of RNTuple switches

* Re-enable RNTuple stl containers test

* Disabled RNTuple multiple page lists test until we have a smaller test file.

* Added missing import

* Switched to using a structured numpy dtype

src/uproot/models/RNTuple.py

@@ -480,9 +480,13 @@ def read_col_page(self, ncol, cluster_i):
         pagelist = linklist[ncol]
         dtype_byte = self.column_records[ncol].type
         dtype_str = uproot.const.rntuple_col_num_to_dtype_dict[dtype_byte]
-        dtype = numpy.dtype("bool") if dtype_str == "bit" else numpy.dtype(dtype_str)
-
         total_len = numpy.sum([desc.num_elements for desc in pagelist], dtype=int)
+        if dtype_str == "switch":
+            dtype = numpy.dtype([("index", "int64"), ("tag", "int32")])
+        elif dtype_str == "bit":
+            dtype = numpy.dtype("bool")
+        else:
+            dtype = numpy.dtype(dtype_str)
         res = numpy.empty(total_len, dtype)
         split = 14 <= dtype_byte <= 21 or 26 <= dtype_byte <= 28
         zigzag = 26 <= dtype_byte <= 28
@@ -568,8 +572,8 @@ def arrays(
 
 # Supporting function and classes
 def _split_switch_bits(content):
-    kindex = numpy.bitwise_and(content, numpy.int64(0x00000000000FFFFF))
-    tags = (content >> 44).astype("int8") - 1
+    tags = content["tag"].astype(numpy.dtype("int8")) - 1
+    kindex = content["index"]
     return kindex, tags
 
 

tests/test_0662_rntuple_stl_containers.py

@@ -13,9 +13,6 @@
 ak = pytest.importorskip("awkward")
 
 
-@pytest.mark.skip(
-    reason="FIXME: skipping test_ntuple_stl_containers.root until #928 is fixed"
-)
 def test_rntuple_stl_containers():
     filename = skhep_testdata.data_path("test_ntuple_stl_containers.root")
     with uproot.open(filename) as f:

tests/test_1191_rntuple_fixes.py

@@ -1,5 +1,6 @@
 # BSD 3-Clause License; see https://github.com/scikit-hep/uproot5/blob/main/LICENSE
 
+import pytest
 import skhep_testdata
 
 import uproot
@@ -57,6 +58,9 @@ def test_empty_page_list():
         assert data[0] == 0
 
 
+@pytest.mark.skip(
+    reason="The file takes too long to download (about 5 seconds). Need to find a smaller test file."
+)
 def test_multiple_page_lists():
     url = "http://root.cern/files/tutorials/ntpl004_dimuon_v1rc2.root"
     with uproot.open(f"simplecache::{url}") as f: