Merge fa085d2 into 200c26f

pyxem · Sep 14, 2020 · 01c4b8b · 01c4b8b
2 parents 200c26f + fa085d2
commit 01c4b8b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 27 deletions.
diff --git a/diffsims/generators/diffraction_generator.py b/diffsims/generators/diffraction_generator.py
@@ -192,8 +192,7 @@ def calculate_profile_data(
         self,
         structure,
         reciprocal_radius=1.0,
-        magnitude_tolerance=1e-5,
-        minimum_intensity=1e-3,
+        minimum_intensity=1e-3
     ):
         """
         Calculates a one dimensional diffraction profile for a structure.
@@ -205,9 +204,6 @@ def calculate_profile_data(
         reciprocal_radius : float
             The maximum radius of the sphere of reciprocal space to sample, in
             reciprocal angstroms.
-        magnitude_tolerance : float
-            The minimum difference between diffraction magnitudes in reciprocal
-            angstroms for two peaks to be considered different.
         minimum_intensity : float
             The minimum intensity required for a diffraction peak to be
             considered real. Deals with numerical precision issues.
@@ -269,7 +265,7 @@ def calculate_profile_data(
                 y.append(v[0])
                 hkls.append(k)
 
-        y = y / max(y) * 100
+        y = np.asarray(y) / max(y) * 100
 
         return ProfileSimulation(x, y, hkls)
 

diff --git a/diffsims/libraries/diffraction_library.py b/diffsims/libraries/diffraction_library.py
@@ -135,17 +135,14 @@ def get_library_entry(self, phase=None, angle=None):
         if phase is not None:
             phase_entry = self[phase]
             if angle is not None:
-                orientations = phase_entry["orientations"]
-                if isinstance(orientations, np.ndarray):
-                    orientations = orientations.tolist()
                 orientation_index = _get_library_entry_from_angles(self, phase, angle)
             else:
                 orientation_index = 0
-        else:
-            if angle is not None:
-                raise ValueError(
-                    "To select a certain angle you must first specify a phase"
+        elif angle is not None:
+            raise ValueError(
+                "To select a certain angle you must first specify a phase"
                 )
+        else:
             phase_entry = next(iter(self.values()))
             orientation_index = 0
 

diff --git a/diffsims/sims/diffraction_simulation.py b/diffsims/sims/diffraction_simulation.py
@@ -175,31 +175,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

diff --git a/diffsims/tests/test_generators/test_rotation_list_generator.py b/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),
     ],

diff --git a/diffsims/tests/test_sims/test_diffraction_simulation.py b/diffsims/tests/test_sims/test_diffraction_simulation.py
@@ -82,7 +82,7 @@ def profile_simulation():
 
 
 def test_plot_profile_simulation(profile_simulation):
-    profile_simulation.get_plot(g_max=1)
+    profile_simulation.get_plot()
 
 
 class TestDiffractionSimulation:

diff --git a/setup.py b/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",
     ],