Merge pull request #2301 from kif/2283_refactor_integrator

2283 refactor integrator
silx-kit · Oct 14, 2024 · b00661a · b00661a
2 parents 938d201 + 7569d06
commit b00661a
Show file tree

Hide file tree

Showing 54 changed files with 4,695 additions and 4,415 deletions.
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -5,6 +5,10 @@
 Change-log of versions
 ======================
 
+Next Version: 2025
+------------------
+- Refactoring of the integrator classes
+
 2024.09 12/09/2024
 ------------------
 - New tutorials:

diff --git a/src/pyFAI/__init__.py b/src/pyFAI/__init__.py
@@ -28,7 +28,7 @@
 
 __author__ = "Jérôme Kieffer"
 __license__ = "MIT"
-__date__ = "28/09/2024"
+__date__ = "09/10/2024"
 
 import sys
 import os
@@ -57,21 +57,26 @@
 """
 
 
-@decorators.deprecated(replacement="pyFAI.azimuthalIntegrator.AzimuthalIntegrator", since_version="0.16")
+@decorators.deprecated(replacement="pyFAI.integrator.azimuthal.AzimuthalIntegrator", since_version="0.16")
 def AzimuthalIntegrator(*args, **kwargs):
-    from .azimuthalIntegrator import AzimuthalIntegrator
+    from .integrator.azimuthal import AzimuthalIntegrator
     return AzimuthalIntegrator(*args, **kwargs)
 
 
-def load(filename):
+def load(filename, type_="AzimuthalIntegrator"):
     """
     Load an azimuthal integrator from a filename description.
 
-    :param str filename: name of the file to load
+    :param str filename: name of the file to load, or dict of config or ponifile ...
     :return: instance of Gerometry of AzimuthalIntegrator set-up with the parameter from the file.
     """
-    from .azimuthalIntegrator import AzimuthalIntegrator
-    return AzimuthalIntegrator.sload(filename)
+    if type_=="AzimuthalIntegrator":
+        from .integrator.azimuthal import AzimuthalIntegrator
+        return AzimuthalIntegrator.sload(filename)
+    else:
+        from .geometry import Geometry
+        Geometry.sload(filename).promote(type_)
+
 
 
 def detector_factory(name, config=None):

diff --git a/src/pyFAI/app/saxs.py b/src/pyFAI/app/saxs.py
@@ -52,7 +52,7 @@
 
 from .. import date as pyFAI_date, version as pyFAI_version, units, utils
 from ..method_registry import IntegrationMethod
-from ..azimuthalIntegrator import AzimuthalIntegrator
+from ..integrator.azimuthal import AzimuthalIntegrator
 hc = units.hc
 
 

diff --git a/src/pyFAI/app/waxs.py b/src/pyFAI/app/waxs.py
@@ -52,7 +52,7 @@
 
 from .. import date as pyFAI_date, version as pyFAI_version, units, utils
 from ..average import average_dark
-from ..azimuthalIntegrator import AzimuthalIntegrator
+from ..integrator.azimuthal import AzimuthalIntegrator
 from ..method_registry import IntegrationMethod
 hc = units.hc