Merge pull request #2751 from kif/2750_Sensor_config_copy

Ensure SensorConfig can be copied

Author: kif

src/pyFAI/detectors/_common.py

@@ -4,7 +4,7 @@
 #    Project: Azimuthal integration
 #             https://github.com/silx-kit/pyFAI
 #
-#    Copyright (C) 2014-2025 European Synchrotron Radiation Facility, Grenoble, France
+#    Copyright (C) 2014-2026 European Synchrotron Radiation Facility, Grenoble, France
 #
 #    Principal author:       Jérôme Kieffer (Jerome.Kieffer@ESRF.eu)
 #
@@ -33,7 +33,7 @@
 __contact__ = "Jerome.Kieffer@ESRF.eu"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "21/11/2025"
+__date__ = "05/01/2026"
 __status__ = "stable"
 
 import logging
@@ -44,6 +44,8 @@
 import json
 from typing import Dict, Any, Union
 import inspect
+import copy
+import types
 
 from .orientation import Orientation
 from .sensors import SensorConfig
@@ -317,12 +319,12 @@ def __deepcopy__(self, memo=None):
             new.__setattr__(key, old)
         for key in self._MUTABLE_ATTRS:
             value = self.__getattribute__(key)
-            if (value is None) or (value is False):
+            if type(value) in (types.NoneType, bool, int, float):
                 new_value = value
             elif "copy" in dir(value):
                 new_value = value.copy()
-            else:
-                new_value = 1 * value
+            else:  # poor's men copy
+                new_value = value * 1
             memo[id(value)] = new_value
             new.__setattr__(key, new_value)
         if self._splinefile:
@@ -1492,7 +1494,6 @@ def __copy__(self):
         return cloned
 
     def __deepcopy__(self, memo=None):
-        import copy
         cloned = self.__class__()
         if memo is not None:
             memo[id(self)] = cloned

src/pyFAI/detectors/sensors.py

@@ -4,7 +4,7 @@
 #    Project: Azimuthal integration
 #             https://github.com/silx-kit/pyFAI
 #
-#    Copyright (C) 2025-2025 European Synchrotron Radiation Facility, Grenoble, France
+#    Copyright (C) 2025-2026 European Synchrotron Radiation Facility, Grenoble, France
 #
 #    Principal author:       Jérôme Kieffer (Jerome.Kieffer@ESRF.eu)
 #
@@ -37,7 +37,7 @@
 __contact__ = "Jerome.Kieffer@ESRF.eu"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "03/10/2025"
+__date__ = "05/01/2026"
 __status__ = "stable"
 
 import os
@@ -156,7 +156,7 @@ def absorbance(self, energy:float, length: float, unit:str="m") -> float:
 ALL_MATERIALS["CdTe"] = CdTe_MATERIAL = SensorMaterial("CdTe", density=5.85)
 ALL_MATERIALS["GaAs"] = GaAs_MATERIAL = SensorMaterial("GaAs", density=5.3176)
 ALL_MATERIALS["Gd2O2S"] = Gd2O2S_MATERIAL = SensorMaterial("Gd2O2S", density=7.32)
-ALL_MATERIALS["BaFBr0.85I0.15"] = BaFBr085I015_MATERIAL = SensorMaterial("BaFBr0.85I0.15", density=3.18) 
+ALL_MATERIALS["BaFBr0.85I0.15"] = BaFBr085I015_MATERIAL = SensorMaterial("BaFBr0.85I0.15", density=3.18)
 ALL_MATERIALS["Se"] = Se_MATERIAL = SensorMaterial("Se", density=4.26)
 
 
@@ -174,6 +174,11 @@ def __str__(self):
         thick = to_eng(self.thickness, space="")+"m" if self.thickness else "\N{INFINITY}"
         return f"{name},{thick}"
 
+    def copy(self):
+        "helper function for the `detector` module"
+        return self.__class__(self.material,  # expected to be immutable
+                              self.thickness)
+
     def as_dict(self):
         """Like asdict, but with some more features:
         """

src/pyFAI/test/test_bug_regression.py

@@ -4,7 +4,7 @@
 #    Project: Azimuthal integration
 #             https://github.com/silx-kit/pyFAI
 #
-#    Copyright (C) 2015-2025 European Synchrotron Radiation Facility, Grenoble, France
+#    Copyright (C) 2015-2026 European Synchrotron Radiation Facility, Grenoble, France
 #
 #    Principal author:       Jérôme Kieffer (Jerome.Kieffer@ESRF.eu)
 #
@@ -36,7 +36,7 @@
 __contact__ = "Jerome.Kieffer@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "2015-2025 European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "17/12/2025"
+__date__ = "05/01/2026"
 
 import sys
 import os
@@ -726,6 +726,12 @@ def test_bug_2736(self):
         self.assertEqual((pos[..., 1]< 0).sum(), 1, "1 pixels below pi azim angle")
         self.assertEqual((pos[..., 1]> 2*pi).sum(), 3, "3 pixels above pi azim angle")
 
+    def test_bug_2750(self):
+        """Checks a detector with a sensor config can be deep-copied"""
+        ai = load({"detector":"Pilatus100k","detector_config":{"sensor":{"material":"Si","thickness":450e-6}}})
+        cpy = copy.deepcopy(ai)
+        self.assertEqual(ai.detector, cpy.detector)
+        self.assertEqual(ai.detector.sensor, cpy.detector.sensor)
 
 
 class TestBug1703(unittest.TestCase):