silx-kit · kif · Jan 10, 2025 · Dec 19, 2024 · Dec 19, 2024 · Dec 20, 2024
diff --git a/ci/private-dictionary.txt b/ci/private-dictionary.txt
@@ -0,0 +1,33 @@
+acc
+ai
+asdict
+azimuthal
+bbox
+bool
+config
+cpu
+csr
+cython
+dataclass
+dataclasses
+dtype
+gpu
+inplace
+io
+Jérôme
+json
+Kieffer
+kwargs
+lima
+lut
+numpy
+opencl
+os
+PathLike
+poissonian
+poni
+rtype
+solidangle
+str
+sublicense
+synchrotron
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -8,6 +8,7 @@ Change-log of versions
 Next Version: 2025
 ------------------
 - Refactoring of the integrator classes
+- New dataclass `pyFAI.io.integration_config.WorkerConfig` which is in charge of the serialization of worker configuration.
 - Tool to rebin 2d-result into 1d-result (`pyFAI.containers.rebin1d`)
 
 2024.09 12/09/2024

diff --git a/src/pyFAI/containers.py b/src/pyFAI/containers.py
@@ -38,6 +38,11 @@
 from .utils.decorators import deprecated_warning
 import numpy
 
+PolarizationArray = namedtuple("PolarizationArray",
+                               ["array", "checksum"])
+PolarizationDescription = namedtuple("PolarizationDescription",
+                                     ["polarization_factor", "axis_offset"])
+
 Integrate1dtpl = namedtuple("Integrate1dtpl", "position intensity sigma signal variance normalization count std sem norm_sq", defaults=(None,) * 3)
 Integrate2dtpl = namedtuple("Integrate2dtpl", "radial azimuthal intensity sigma signal variance normalization count std sem norm_sq", defaults=(None,) * 3)
 

diff --git a/src/pyFAI/ext/_convolution.pyx b/src/pyFAI/ext/_convolution.pyx
@@ -38,7 +38,7 @@ algorithm.
 
 __authors__ = ["Pierre Paleo", "Jérôme Kieffer"]
 __contact__ = "[email protected]"
-__date__ = "03/03/2023"
+__date__ = "06/01/2025"
 __status__ = "stable"
 __license__ = "MIT"
 
@@ -63,7 +63,7 @@ def horizontal_convolution(float[:, ::1] img,
         int FILTER_SIZE, HALF_FILTER_SIZE
         int IMAGE_H, IMAGE_W
         int x, y, fIndex, newpos
-        double acc
+        double acc=0.0
         float[:, ::1] output
 
     FILTER_SIZE = filter.shape[0]
@@ -104,7 +104,7 @@ def vertical_convolution(float[:, ::1] img, float[::1] filter):
         int FILTER_SIZE, HALF_FILTER_SIZE
         int IMAGE_H, IMAGE_W
         int x, y, fIndex, newpos
-        double acc
+        double acc=0.0
         float[:, ::1] output
 
     FILTER_SIZE = filter.shape[0]

diff --git a/src/pyFAI/ext/_distortion.pyx b/src/pyFAI/ext/_distortion.pyx
@@ -35,7 +35,7 @@ Distortion correction are correction are applied by look-up table (or CSR)
 
 __author__ = "Jerome Kieffer"
 __license__ = "MIT"
-__date__ = "09/03/2023"
+__date__ = "07/01/2025"
 __copyright__ = "2011-2021, ESRF"
 __contact__ = "[email protected]"
 
@@ -170,7 +170,7 @@ def calc_size(floating[:, :, :, ::1] pos not None,
     cdef:
         int i, j, k, l, shape_out0, shape_out1, shape_in0, shape_in1, min0, min1, max0, max1
         int32_t[:, ::1] lut_size = numpy.zeros(shape, dtype=numpy.int32)
-        float A0, A1, B0, B1, C0, C1, D0, D1, offset0, offset1
+        float A0, A1, B0, B1, C0, C1, D0, D1, offset0=0.0, offset1=0.0
         bint do_mask = mask is not None
         int8_t[:, ::1] cmask
     shape_in0, shape_in1 = pos.shape[0], pos.shape[1]

diff --git a/src/pyFAI/ext/_geometry.pyx b/src/pyFAI/ext/_geometry.pyx
@@ -37,7 +37,7 @@ coordinates.
 
 __author__ = "Jerome Kieffer"
 __license__ = "MIT"
-__date__ = "04/12/2023"
+__date__ = "07/01/2025"
 __copyright__ = "2011-2020, ESRF"
 __contact__ = "[email protected]"
 
@@ -635,7 +635,7 @@ def calc_rad_azim(double L,
         double[::1] c2 = numpy.ascontiguousarray(pos2.ravel(), dtype=numpy.float64)
         double[::1] c3
         float[:, ::1] out = numpy.empty((size, 2), dtype=numpy.float32)
-        double t1, t2, t3, fwavelength, chi
+        double t1, t2, t3, chi, fwavelength=0.0
 
     if space == "2th":
         cspace = 1

diff --git a/src/pyFAI/ext/inpainting.pyx b/src/pyFAI/ext/inpainting.pyx
@@ -8,7 +8,7 @@
 #             https://github.com/silx-kit/pyFAI
 #
 #
-#    Copyright (C) 2017-2022 European Synchrotron Radiation Facility, Grenoble, France
+#    Copyright (C) 2017-2025 European Synchrotron Radiation Facility, Grenoble, France
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,7 @@
 Cython module for doing inpaining of images.
 """
 __author__ = "Jérôme Kieffer"
-__date__ = "12/11/2024"
+__date__ = "07/01/2025"
 __contact__ = "[email protected]"
 __license__ = "MIT"
 
@@ -142,7 +142,7 @@ def polar_inpaint(floating[:, :] img not None,
         int row, col, npt_radial, npt_azim, idx_col, idx_row, tar_row, radius, dist
         float[:, ::1] res
         bint do_dummy = empty is not None
-        float value, dummy
+        float value, dummy=0.0
         double sum, cnt, weight
         list values
 

diff --git a/src/pyFAI/ext/reconstruct.pyx b/src/pyFAI/ext/reconstruct.pyx
@@ -37,7 +37,7 @@ image (masked) to be able to use more common algorithms.
 
 __author__ = "Jerome Kieffer"
 __contact__ = "[email protected]"
-__date__ = "12/11/2024"
+__date__ = "07/01/2025"
 __status__ = "stable"
 __license__ = "MIT"
 
@@ -131,7 +131,7 @@ def reconstruct(data,
         float[:, ::1] cdata
         int8_t[:, ::1] cmask
         bint is_masked, do_dummy
-        float cdummy, cddummy, value
+        float cdummy=0.0, cddummy=0.0, value
         float[:, ::1] out = numpy.zeros_like(data)
 
     cdata = numpy.ascontiguousarray(data, dtype=numpy.float32)

diff --git a/src/pyFAI/geometry/core.py b/src/pyFAI/geometry/core.py
@@ -40,21 +40,21 @@
 __contact__ = "[email protected]"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "10/10/2024"
+__date__ = "20/12/2024"
 __status__ = "production"
 __docformat__ = 'restructuredtext'
 
 import copy
 import logging
 from math import pi
-twopi = 2 * pi
 from numpy import arccos, arctan2, sin, cos, sqrt
 import numpy
 import os
 import threading
 import json
 import gc
-from collections import namedtuple, OrderedDict
+from collections import OrderedDict
+from ..containers import PolarizationArray, PolarizationDescription
 from .fit2d import convert_to_Fit2d, convert_from_Fit2d
 from .imaged11 import convert_from_ImageD11, convert_to_ImageD11
 from .. import detectors
@@ -64,6 +64,7 @@
 from .. import utils
 from ..io import ponifile, integration_config
 from ..units import CONST_hc, to_unit, UnitFiber
+TWO_PI = 2 * pi
 
 logger = logging.getLogger(__name__)
 
@@ -85,9 +86,6 @@
     logger.debug("Backtrace", exc_info=True)
     bilinear = None
 
-PolarizationArray = namedtuple("PolarizationArray", ["array", "checksum"])
-PolarizationDescription = namedtuple("PolarizationDescription",
-                                     ["polarization_factor", "axis_offset"])
 
 
 class Geometry(object):
@@ -266,7 +264,7 @@ def normalize_azimuth_range(self, azimuth_range):
             return
         azimuth_range = tuple(deg2rad(azimuth_range[i], self.chiDiscAtPi) for i in (0, -1))
         if azimuth_range[1] <= azimuth_range[0]:
-            azimuth_range = (azimuth_range[0], azimuth_range[1] + twopi)
+            azimuth_range = (azimuth_range[0], azimuth_range[1] + TWO_PI)
             self.check_chi_disc(azimuth_range)
         return azimuth_range
 
@@ -561,7 +559,7 @@ def rd2Array(self, shape=None):
         if self._cached_array.get("d*2_center") is None:
             with self._sem:
                 if self._cached_array.get("d*2_center") is None:
-                    self._cached_array["d*2_center"] = (qArray / (twopi)) ** 2
+                    self._cached_array["d*2_center"] = (qArray / (TWO_PI)) ** 2
         return self._cached_array["d*2_center"]
 
     @deprecated
@@ -641,7 +639,7 @@ def chi(self, d1, d2, path="cython"):
             _, t1, t2 = self.calc_pos_zyx(d0=None, d1=d1, d2=d2, corners=False, use_cython=True, do_parallax=True)
             chi = numpy.arctan2(t1, t2)
             if not self.chiDiscAtPi:
-                numpy.mod(chi, (twopi), out=chi)
+                numpy.mod(chi, (TWO_PI), out=chi)
         return chi
 
     def chi_corner(self, d1, d2):
@@ -678,7 +676,7 @@ def chiArray(self, shape=None):
                     chia = numpy.fromfunction(self.chi, shape,
                                               dtype=numpy.float32)
                     if not self.chiDiscAtPi:
-                        chia = chia % (twopi)
+                        chia = chia % (TWO_PI)
                     self._cached_array["chi_center"] = chia
         return self._cached_array["chi_center"]
 
@@ -824,10 +822,10 @@ def corner_array(self, shape=None, unit=None, use_cython=True, scale=True):
                             # numpy path
                             chi = numpy.arctan2(y, x)
                             if not self.chiDiscAtPi:
-                                numpy.mod(chi, (twopi), out=chi)
+                                numpy.mod(chi, (TWO_PI), out=chi)
                         else:
                             # numexpr path
-                            chi = numexpr.evaluate("arctan2(y, x)") if self.chiDiscAtPi else numexpr.evaluate("arctan2(y, x)%twopi")
+                            chi = numexpr.evaluate("arctan2(y, x)") if self.chiDiscAtPi else numexpr.evaluate("arctan2(y, x)%TWO_PI")
                         corners = numpy.zeros((shape[0], shape[1], nb_corners, 2),
                                               dtype=numpy.float32)
                         if chi.shape[:2] == shape:
@@ -948,7 +946,7 @@ def center_array(self, shape=None, unit="2th_deg", scale=True):
             ary = unit.equation(x, y, z, self.wavelength)
 
         if unit.space == "chi" and not self.chiDiscAtPi:
-            numpy.mod(ary, twopi, out=ary)
+            numpy.mod(ary, TWO_PI, out=ary)
         self._cached_array[key] = ary
         if scale and unit:
                 return ary * unit.scale
@@ -986,9 +984,9 @@ def delta_array(self, shape=None, unit="2th_deg", scale=False):
         delta = abs(corners[..., 0] - numpy.atleast_3d(center))
         if space == "chi_delta":
             if numexpr:
-                delta = numexpr.evaluate("where(delta<twopi-delta, delta, twopi-delta)")
+                delta = numexpr.evaluate("where(delta<TWO_PI-delta, delta, TWO_PI-delta)")
             else:
-                numpy.minimum(delta, twopi - delta, out=delta)
+                numpy.minimum(delta, TWO_PI - delta, out=delta)
 
         ary = delta.max(axis=-1)
         self._cached_array[space] = ary
@@ -1024,8 +1022,8 @@ def deltaChi(self, shape=None, use_cython=True):
                         self._cached_array[key] = delta
                     else:
                         center = numpy.atleast_3d(center)
-                        delta = numpy.minimum(((corner[:,:,:, 1] - center) % twopi),
-                                              ((center - corner[:,:,:, 1]) % twopi))
+                        delta = numpy.minimum(((corner[:,:,:, 1] - center) % TWO_PI),
+                                              ((center - corner[:,:,:, 1]) % TWO_PI))
                         self._cached_array[key] = delta.max(axis=-1)
         return self._cached_array[key]
 

diff --git a/src/pyFAI/gui/test/test_integrate_widget.py b/src/pyFAI/gui/test/test_integrate_widget.py
@@ -32,7 +32,7 @@
 __contact__ = "[email protected]"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "16/10/2020"
+__date__ = "20/12/2024"
 
 import unittest
 import logging