Merge #1035 which renames some private utils

pyxem · Mar 17, 2024 · 7c94927 · 7c94927
2 parents ff7fd9f + 2261922
commit 7c94927
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/examples/virtual_imaging/creating_a_segmented_detector.py b/examples/virtual_imaging/creating_a_segmented_detector.py
@@ -10,7 +10,7 @@
 """
 
 import pyxem as pxm
-from pyxem.utils._azimuthal_utils import _get_control_points
+from pyxem.utils._azimuthal_integrations import _get_control_points
 import numpy as np
 import hyperspy.api as hs
 

diff --git a/pyxem/signals/diffraction2d.py b/pyxem/signals/diffraction2d.py
@@ -63,7 +63,7 @@
     sigma_clip,
     center_of_mass,
 )
-from pyxem.utils._azimuthal_utils import (
+from pyxem.utils._azimuthal_integrations import (
     _slice_radial_integrate,
     _slice_radial_integrate1d,
 )
@@ -2079,7 +2079,9 @@ def get_azimuthal_integral2d(
                 npt, npt_azim, radial_range=radial_range
             )
             if self._gpu and CUPY_INSTALLED:  # pragma: no cover
-                from pyxem.utils._azimuthal_utils import _slice_radial_integrate_cupy
+                from pyxem.utils._azimuthal_integrations import (
+                    _slice_radial_integrate_cupy,
+                )
 
                 slices = cp.asarray(slices)
                 factors = cp.asarray(factors)

diff --git a/pyxem/signals/diffraction_vectors.py b/pyxem/signals/diffraction_vectors.py
@@ -47,7 +47,7 @@
 
 from pyxem.utils._slicers import Slicer
 
-from pyxem.utils._subpixel_utils import (
+from pyxem.utils._subpixel_finding import (
     _conventional_xc_map,
     _center_of_mass_map,
     _get_simulated_disc,

diff --git a/pyxem/tests/signals/test_diffraction_vectors.py b/pyxem/tests/signals/test_diffraction_vectors.py
@@ -27,7 +27,7 @@
 
 
 from pyxem.signals import DiffractionVectors, DiffractionVectors2D
-from pyxem.utils._subpixel_utils import (
+from pyxem.utils._subpixel_finding import (
     _center_of_mass_hs,
     _get_experimental_square,
     _conventional_xc,

diff --git a/pyxem/utils/_azimuthal_utils.py → pyxem/utils/_azimuthal_integrations.py b/pyxem/utils/_azimuthal_utils.py → pyxem/utils/_azimuthal_integrations.py
diff --git a/pyxem/utils/_subpixel_utils.py → pyxem/utils/_subpixel_finding.py b/pyxem/utils/_subpixel_utils.py → pyxem/utils/_subpixel_finding.py
diff --git a/pyxem/utils/calibration_utils.py b/pyxem/utils/calibration_utils.py
@@ -25,7 +25,7 @@
 from hyperspy.axes import UniformDataAxis
 
 from pyxem.utils.indexation_utils import index_dataset_with_template_rotation
-from pyxem.utils._azimuthal_utils import _get_control_points, _get_factors
+from pyxem.utils._azimuthal_integrations import _get_control_points, _get_factors
 from pyxem.utils._deprecated import deprecated