updated tests pass

Author: alexlib

src/openptv_python/_native_compat.py

@@ -241,6 +241,28 @@ def get_multimedia_par(control_params: Any) -> Any:
     return converted
 
 
+def get_image_size(control_params: Any) -> tuple[int, int]:
+    """Return the image size from either backend's control parameter object."""
+
+    getter = getattr(control_params, "get_image_size", None)
+    if callable(getter):
+        imx, imy = getter()
+        return int(imx), int(imy)
+
+    return int(getattr(control_params, "imx")), int(getattr(control_params, "imy"))
+
+
+def get_pixel_size(control_params: Any) -> tuple[float, float]:
+    """Return the pixel size from either backend's control parameter object."""
+
+    getter = getattr(control_params, "get_pixel_size", None)
+    if callable(getter):
+        pix_x, pix_y = getter()
+        return float(pix_x), float(pix_y)
+
+    return float(getattr(control_params, "pix_x")), float(getattr(control_params, "pix_y"))
+
+
 # Initialize once so the default preference is explicit and optv availability
 # is reported immediately in sessions where it is missing.
 set_engine(DEFAULT_ENGINE, warn_once=True)

src/openptv_python/find_candidate.py

@@ -10,6 +10,7 @@
 from .parameters import ControlPar, VolumePar
 from .tracking_frame_buf import Target
 from .trafo import correct_brown_affine
+from ._native_compat import get_image_size, get_pixel_size
 
 
 def find_candidate(
@@ -63,10 +64,13 @@ def find_candidate(
     # The image space is the image plane of the camera. The image space is
     # given in millimeters of sensor size and the origin is in the center of the sensor.
 
-    xmin = (-1) * cpar.pix_x * cpar.imx / 2
-    xmax = cpar.pix_x * cpar.imx / 2
-    ymin = (-1) * cpar.pix_y * cpar.imy / 2
-    ymax = cpar.pix_y * cpar.imy / 2
+    imx, imy = get_image_size(cpar)
+    pix_x, pix_y = get_pixel_size(cpar)
+
+    xmin = (-1) * pix_x * imx / 2
+    xmax = pix_x * imx / 2
+    ymin = (-1) * pix_y * imy / 2
+    ymax = pix_y * imy / 2
     xmin -= cal.int_par.xh
     ymin -= cal.int_par.yh
     xmax -= cal.int_par.xh

src/openptv_python/track.py

@@ -856,7 +856,7 @@ def trackcorr_c_loop(run_info, step):
         count2 += 1
         mm = 0
         # counter1-loop
-        while w[mm].ftnr != TR_UNUSED and len(fb.buf[2].path_info) > w[mm].ftnr:
+        while mm < w.shape[0] and w[mm].ftnr != TR_UNUSED and len(fb.buf[2].path_info) > w[mm].ftnr:
             # search for found corr of current the corr in next_frame with predicted location
 
             # found 3D-position
@@ -883,7 +883,9 @@ def trackcorr_c_loop(run_info, step):
                 count3 += 1
                 kk = 0
                 while (
-                    wn[kk].ftnr != TR_UNUSED and len(fb.buf[3].path_info) > wn[kk].ftnr
+                    kk < wn.shape[0]
+                    and wn[kk].ftnr != TR_UNUSED
+                    and len(fb.buf[3].path_info) > wn[kk].ftnr
                 ):
                     # print(f" inside wn[{kk}].ftnr {wn[kk].ftnr}")
                     ref_path_inf = fb.buf[3].path_info[wn[kk].ftnr]
@@ -1175,7 +1177,7 @@ def trackback_c(run_info: TrackingRun):
                 count2 += 1
 
                 i = 0
-                while w[i].ftnr != TR_UNUSED:
+                while i < w.shape[0] and w[i].ftnr != TR_UNUSED:
                     ref_path_inf = fb.buf[2].path_info[w[i].ftnr]
                     X[3] = vec_copy(ref_path_inf.x)