[pyroot] add np.int16 and np.uint16 to conversion map

Fixes #18365

Author: ferdymercury

bindings/pyroot/pythonizations/python/ROOT/_pythonization/_rvec.py

@@ -75,7 +75,7 @@
 
 
 def _get_cpp_type_from_numpy_type(dtype):
-    cpptypes = {"i4": "int", "u4": "unsigned int", "i8": "Long64_t", "u8": "ULong64_t", "f4": "float", "f8": "double", "b1": "bool"}
+    cpptypes = {"i2": "Short_t", "u2": "UShort_t", "i4": "int", "u4": "unsigned int", "i8": "Long64_t", "u8": "ULong64_t", "f4": "float", "f8": "double", "b1": "bool"}
 
     if not dtype in cpptypes:
         raise RuntimeError("Object not convertible: Python object has unknown data-type '" + dtype + "'.")

bindings/pyroot/pythonizations/test/rvec_asrvec.py

@@ -26,7 +26,7 @@ class AsRVec(unittest.TestCase):
 
     # Helpers
     dtypes = [
-        "int32", "int64", "uint32", "uint64", "float32", "float64", "bool"
+        "int16", "int32", "int64", "uint16", "uint32", "uint64", "float32", "float64", "bool"
     ]
 
     def check_memory_adoption(self, root_obj, np_obj):

bindings/pyroot/pythonizations/test/ttree_setbranchaddress.py

@@ -184,6 +184,46 @@ def test_class_with_array_member(self):
             self.assertEqual(mc.foo[0], 1.0)
             self.assertEqual(mc.foo[1], 2.0)
 
+    def test_np_conversion(self):
+        # 18365
+        a = np.zeros(3, np.uint16)
+        a[0] = 1
+        a[1] = 2
+        a[2] = 3
+        c = np.zeros(3, np.int16)
+        c[0] = 4
+        c[1] = 5
+        c[2] = 6
+        t = ROOT.TTree("t", "t")
+        t.Branch("b", a, "b[3]/s")
+        t.Branch("d", c, "d[3]/S")
+        t.Fill()
+        a[0] = 10
+        a[1] = 20
+        a[2] = 30
+        c[0] = 40
+        c[1] = 50
+        c[2] = 60
+        t.Fill()
+        # t.Print()
+        # t.Scan()
+        t.SetBranchAddress("b", a)
+        t.SetBranchAddress("d", c)
+        t.GetEntry(0)
+        self.assertEqual(a[0], 1)
+        self.assertEqual(a[1], 2)
+        self.assertEqual(a[2], 3)
+        self.assertEqual(c[0], 4)
+        self.assertEqual(c[1], 5)
+        self.assertEqual(c[2], 6)
+        t.GetEntry(1)
+        self.assertEqual(a[0], 10)
+        self.assertEqual(a[1], 20)
+        self.assertEqual(a[2], 30)
+        self.assertEqual(c[0], 40)
+        self.assertEqual(c[1], 50)
+        self.assertEqual(c[2], 60)
+
 
 if __name__ == "__main__":
     unittest.main()