Merge 594a006 into 9562ac8

diffsims/sims/diffraction_simulation.py

@@ -177,31 +177,22 @@ class ProfileSimulation:
         Magnitudes of scattering vectors.
     intensities : array-like, shape [n_peaks, 1]
         The kinematic intensity of the diffraction peaks.
-
-    Returns
-    -------
     hkls: [{(h, k, l): mult}] {(h, k, l): mult} is a dict of Miller
         indices for all diffracted lattice facets contributing to each
         intensity.
     """
 
     def __init__(self, magnitudes, intensities, hkls):
-        """Initializes the ProfileSimulation object with data values for the
-        magnitudes, intensities, and hkls.
-        """
         self.magnitudes = magnitudes
         self.intensities = intensities
         self.hkls = hkls
 
-    def get_plot(self, g_max, annotate_peaks=True, with_labels=True, fontsize=12):
-
+    def get_plot(self,annotate_peaks=True, with_labels=True, fontsize=12):
         """Plots the diffraction profile simulation for the
            calculate_profile_data method in DiffractionGenerator.
 
         Parameters
         ----------
-        g_max : float
-            Maximum g-vector magnitude to plot.
         annotate_peaks : boolean
             If True, peaks are annotaed with hkl information.
         with_labels : boolean

diffsims/tests/test_generators/test_rotation_list_generator.py

@@ -30,8 +30,7 @@
     "grid",
     [
         pytest.param(
-            get_local_grid(resolution=30, center=(0, 1, 0), grid_width=35),
-            marks=pytest.mark.xfail(reason="Downstream bug"),
+            get_local_grid(resolution=30, center=(0,1,0), grid_width=35)
         ),
         get_fundamental_zone_grid(space_group=20, resolution=20),
     ],

setup.py

@@ -51,7 +51,7 @@
         "tqdm>=0.4.9",
         "transforms3d",
         "diffpy.structure>=3.0.0",  # First Python 3 support
-        "orix>=0.4.0",
+        "orix>=0.5.0",
         "numba",
         "psutil",
     ],