Change call signatures of c extensions to use full widths

Author: steinhh

src/crtools/fmedian/__init__.py

@@ -86,14 +86,9 @@ def fmedian(input_array, xsize: int, ysize: int, exclude_center: int):
     if ysize <= 0:
         raise ValueError(f"ysize must be positive, got {ysize}")
 
-    # Convert from full window size to half-size for the C extension
-    # For a window of size 3, we need half-size of 1
-    xhalf = xsize // 2
-    yhalf = ysize // 2
-
     arr = _np.asarray(input_array, dtype=_np.float64)
     out = _np.empty_like(arr, dtype=_np.float64)
-    _c_fmedian(arr, out, xhalf, yhalf, int(exclude_center))
+    _c_fmedian(arr, out, xsize, ysize, int(exclude_center))
     return out
 
 

src/crtools/fmedian/fmedian_ext.c

@@ -95,6 +95,10 @@ static PyObject *fmedian(PyObject *self, PyObject *args)
     return NULL;
   }
 
+  /* Convert from full window size to half-size for internal use */
+  int xsize_half = xsize / 2;
+  int ysize_half = ysize / 2;
+
   /* Check input arguments */
   if (check_inputs(input_array, output_array, &height, &width) != 0)
   {
@@ -110,7 +114,7 @@ static PyObject *fmedian(PyObject *self, PyObject *args)
   npy_intp *output_strides = PyArray_STRIDES(output_array);
 
   /* Allocate buffer for neighborhood values */
-  int max_neighbors = (2 * xsize + 1) * (2 * ysize + 1);
+  int max_neighbors = (2 * xsize_half + 1) * (2 * ysize_half + 1);
   double *neighbors = (double *)malloc(max_neighbors * sizeof(double));
   if (neighbors == NULL)
   {
@@ -129,9 +133,9 @@ static PyObject *fmedian(PyObject *self, PyObject *args)
       double center_value = *(double *)(((char *)input_data) + y * input_strides[0] + x * input_strides[1]);
 
       /* Collect neighborhood values (conditionally include center) */
-      for (int dy = -ysize; dy <= ysize; dy++)
+      for (int dy = -ysize_half; dy <= ysize_half; dy++)
       {
-        for (int dx = -xsize; dx <= xsize; dx++)
+        for (int dx = -xsize_half; dx <= xsize_half; dx++)
         {
           int ny = y + dy;
           int nx = x + dx;
@@ -197,9 +201,9 @@ static PyMethodDef FmedianMethods[] = {
      "    output_array : numpy.ndarray (float64, 2D)\n"
      "        Output array (same size as input)\n"
      "    xsize : int\n"
-     "        Half-width of window in x direction\n"
+     "        Full width of window in x direction\n"
      "    ysize : int\n"
-     "        Half-width of window in y direction\n"
+     "        Full height of window in y direction\n"
      "    exclude_center : int\n"
      "        If non-zero, exclude the center pixel from the median calculation\n"},
     {NULL, NULL, 0, NULL}};

src/crtools/fsigma/__init__.py

@@ -75,14 +75,9 @@ def fsigma(input_array, xsize: int, ysize: int, exclude_center: int):
     if ysize <= 0:
         raise ValueError(f"ysize must be positive, got {ysize}")
 
-    # Convert from full window size to half-size for the C extension
-    # For a window of size 3, we need half-size of 1
-    xhalf = xsize // 2
-    yhalf = ysize // 2
-
     arr = _np.asarray(input_array, dtype=_np.float64)
     out = _np.empty_like(arr, dtype=_np.float64)
-    _c_fsigma(arr, out, xhalf, yhalf, int(exclude_center))
+    _c_fsigma(arr, out, xsize, ysize, int(exclude_center))
     return out
 
 

src/crtools/fsigma/fsigma_ext.c

@@ -90,6 +90,10 @@ static PyObject *fsigma(PyObject *self, PyObject *args)
     return NULL;
   }
 
+  /* Convert from full window size to half-size for internal use */
+  int xsize_half = xsize / 2;
+  int ysize_half = ysize / 2;
+
   /* Check input arguments */
   if (check_inputs(input_array, output_array, &height, &width) != 0)
   {
@@ -105,7 +109,7 @@ static PyObject *fsigma(PyObject *self, PyObject *args)
   npy_intp *output_strides = PyArray_STRIDES(output_array);
 
   /* Allocate buffer for neighborhood values */
-  int max_neighbors = (2 * xsize + 1) * (2 * ysize + 1);
+  int max_neighbors = (2 * xsize_half + 1) * (2 * ysize_half + 1);
   double *neighbors = (double *)malloc(max_neighbors * sizeof(double));
   if (neighbors == NULL)
   {
@@ -121,9 +125,9 @@ static PyObject *fsigma(PyObject *self, PyObject *args)
       int count = 0;
 
       /* Collect neighborhood values (conditionally include center) */
-      for (int dy = -ysize; dy <= ysize; dy++)
+      for (int dy = -ysize_half; dy <= ysize_half; dy++)
       {
-        for (int dx = -xsize; dx <= xsize; dx++)
+        for (int dx = -xsize_half; dx <= xsize_half; dx++)
         {
           int ny = y + dy;
           int nx = x + dx;
@@ -169,9 +173,9 @@ static PyMethodDef FsigmaMethods[] = {
      "    output_array : numpy.ndarray (float64, 2D)\n"
      "        Output array (same size as input)\n"
      "    xsize : int\n"
-     "        Half-width of window in x direction\n"
+     "        Full width of window in x direction\n"
      "    ysize : int\n"
-     "        Half-width of window in y direction\n"
+     "        Full height of window in y direction\n"
      "    exclude_center : int\n"
      "        If non-zero, exclude the center pixel from the computation.\n"
      "\n"