fix some integer and float definitions

Author: a-sevin

shesha/config/config_setter_utils.py

@@ -39,7 +39,8 @@
 
 
 def enforce_int(n):
-    if not isinstance(n, int):
+    if not (isinstance(n, int) or isinstance(n, np.int32) or isinstance(n,
+                                                                        np.int64)):
         raise TypeError("Value should be integer.")
     return n
 

shesha/init/dm_init.py

@@ -627,7 +627,7 @@ def init_custom_dm(p_dm: conf.Param_dm, p_geom: conf.Param_geom, diam: float):
 
     # Allocate influence function maps and other arrays
     p_dm._ntotact = ntotact
-    p_dm._influsize = np.int(smallsize)
+    p_dm._influsize = np.int32(smallsize)
     p_dm._i1 = np.zeros(ntotact, dtype=np.int32)
     p_dm._j1 = np.zeros(ntotact, dtype=np.int32)
     p_dm._xpos = np.zeros(ntotact, dtype=np.float32)
@@ -736,11 +736,11 @@ def make_kl_dm(p_dm: conf.Param_dm, patchDiam: int, p_geom: conf.Param_geom,
     print("KL type: ", p_dm.type_kl)
 
     if (p_dm.nkl < 13):
-        nr = np.long(5.0 * np.sqrt(52))  # one point per degree
-        npp = np.long(10.0 * nr)
+        nr = np.int64(5.0 * np.sqrt(52))  # one point per degree
+        npp = np.int64(10.0 * nr)
     else:
-        nr = np.long(5.0 * np.sqrt(p_dm.nkl))
-        npp = np.long(10.0 * nr)
+        nr = np.int64(5.0 * np.sqrt(p_dm.nkl))
+        npp = np.int64(10.0 * nr)
 
     radp = kl_util.make_radii(cobs, nr)
 

shesha/util/kl_util.py

@@ -1,4 +1,4 @@
-## @package   shesha.util.kl_util
+# @package   shesha.util.kl_util
 ## @brief     Functions for DM KL initialization
 ## @author    COMPASS Team <https://github.com/ANR-COMPASS>
 ## @version   5.4.3
@@ -186,7 +186,7 @@ def radii(nr: int, npp: int, cobs: float) -> np.ndarray:
             r
     """
 
-    r2 = cobs**2 + (np.arange(nr, dtype=np.float) + 0.) / nr * (1.0 - cobs**2)
+    r2 = cobs**2 + (np.arange(nr, dtype=np.float32) + 0.) / nr * (1.0 - cobs**2)
     rs = np.sqrt(r2)
     r = np.transpose(np.tile(rs, (npp, 1)))
 
@@ -215,7 +215,7 @@ def polang(r: np.ndarray) -> np.ndarray:
     s = r.shape
     nr = s[0]
     np1 = s[1]
-    phi1 = np.arange(np1, dtype=np.float) / float(np1) * 2. * np.pi
+    phi1 = np.arange(np1, dtype=np.float32) / float(np1) * 2. * np.pi
     p1, p2 = np.meshgrid(np.ones(nr), phi1)
     p = np.transpose(p2)
 
@@ -348,7 +348,7 @@ def pcgeom(nr, npp, cobs, ncp, ncmar):
     """
     nused = ncp - 2 * ncmar
     ff = 0.5 * nused
-    hw = np.float(ncp - 1) / 2.
+    hw = np.float32(ncp - 1) / 2.
 
     r = radii(nr, npp, cobs)
     p = polang(r)
@@ -358,7 +358,7 @@ def pcgeom(nr, npp, cobs, ncp, ncmar):
     px = ff * px0 + hw
     py = ff * py0 + hw
     ax = np.reshape(
-            np.arange(int(ncp)**2, dtype=np.float) + 1, (int(ncp), int(ncp)), order='F')
+            np.arange(int(ncp)**2, dtype=np.float32) + 1, (int(ncp), int(ncp)), order='F')
     ax = np.float32(ax - 1) % ncp - 0.5 * (ncp - 1)
     ax = ax / (0.5 * nused)
     ay = np.transpose(ax)

shesha/util/make_pupil.py

@@ -692,8 +692,8 @@ def fillPolygon(x, y, i0, j0, scale, gap, N, index=0):
     # Last triangle has a special treatment because it crosses the axis
     # with theta=0=2pi
     n = x.shape[0]  # number of corners of polygon
-    indx, indy = (np.array([], dtype=np.int), np.array([], dtype=np.int))
-    distedge = np.array([], dtype=np.float)
+    indx, indy = (np.array([], dtype=np.int32), np.array([], dtype=np.int32))
+    distedge = np.array([], dtype=np.float32)
     for i in range(n):
         j = i + 1  # j=element next i except when i==n : then j=0 (cycling)
         if j == n: