improving type annotations

lisainstrument/shift_inversion_numpy.py

@@ -8,11 +8,11 @@ interpolation.
 
 from __future__ import annotations
 
-from typing import Final
+from typing import Callable, Final
 
 import numpy as np
 
-from lisainstrument.fir_filters_numpy import NumpyArray1D
+from lisainstrument.fir_filters_numpy import NumpyArray1D, make_numpy_array_1d
 from lisainstrument.regular_interpolators import (
     RegularInterpolator,
     make_regular_interpolator_lagrange,
@@ -37,7 +37,7 @@ class ShiftInverseNumpy:  # pylint: disable=too-few-public-methods
             max_iter: Maximum iterations before fail
             tolerance: Maximum absolute error of result
         """
-        self._max_abs_shift: Final = float(max_abs_shift)
+        self._max_abs_shift: Final = int(np.ceil(max_abs_shift))
         self._interp_np: Final = interp
         self._max_iter = int(max_iter)
         self._tolerance = float(tolerance)
@@ -58,7 +58,9 @@ class ShiftInverseNumpy:  # pylint: disable=too-few-public-methods
         """
         return self._interp_np.margin_right + self._max_abs_shift
 
-    def _fixed_point_iter(self, f, x):
+    def _fixed_point_iter(
+        self, f: Callable[[NumpyArray1D], NumpyArray1D], x: NumpyArray1D
+    ):
         for _ in range(self._max_iter):
             x_next = f(x)
             error = np.max(np.abs(x - x_next))
@@ -81,18 +83,19 @@ class ShiftInverseNumpy:  # pylint: disable=too-few-public-methods
         Returns:
             1D numpy array with shift for inverse coordinate transform
         """
+        dx = make_numpy_array_1d(shift)
 
-        shift_pad = np.pad(
-            shift,
+        dx_pad = np.pad(
+            dx,
             (self._margin_left, self._margin_right),
             mode="constant",
             constant_values=(shift[0], shift[-1]),
         )
 
-        def f_iter(x: np.ndarray) -> np.ndarray:
-            return self._interp_np.apply_shift(shift_pad, -x, self._margin_left)
+        def f_iter(x: NumpyArray1D) -> NumpyArray1D:
+            return self._interp_np.apply_shift(dx_pad, -x, self._margin_left)
 
-        return self._fixed_point_iter(f_iter, shift)
+        return self._fixed_point_iter(f_iter, dx)
 
 
 def make_shift_inverse_lagrange_numpy(