From f67cc0a1db0dc64ac4fc92263922460bf0851517 Mon Sep 17 00:00:00 2001
From: isabelwood100 <68221994+isabelwood100@users.noreply.github.com>
Date: Thu, 27 Aug 2020 14:46:38 +0100
Subject: [PATCH] Update

---
 diffsims/tests/test_utils/test_sim_utils.py | 10 ++++------
 diffsims/utils/sim_utils.py                 |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/diffsims/tests/test_utils/test_sim_utils.py b/diffsims/tests/test_utils/test_sim_utils.py
index 1659eb65..93000891 100644
--- a/diffsims/tests/test_utils/test_sim_utils.py
+++ b/diffsims/tests/test_utils/test_sim_utils.py
@@ -140,9 +140,8 @@ def test_uvtw_to_uvw(uvtw, uvw):
     np.testing.assert_almost_equal(val, uvw)
 
 
-def test_get_intensities_params():
-    struct = make_structure()
-    latt = struct.lattice
+def test_get_intensities_params(default_structure):
+    latt = default_structure.lattice
     reciprocal_lattice = latt.reciprocal()
     reciprocal_radius = 0.2
     unique_hkls, multiplicites, g_hkls = get_intensities_params(reciprocal_lattice, reciprocal_radius)
@@ -151,9 +150,8 @@ def test_get_intensities_params():
     print(unique_hkls)
     np.testing.assert_array_equal(unique_hkls, [[1., 0., 0.], [0., 0., 0.]])
 
-def test_get_kinematical_intensities():
-    struct = make_structure()
-    latt = struct.lattice
+def test_get_kinematical_intensities(default_structure):
+    latt = default_structure.lattice
     reciprocal_lattice = latt.reciprocal()
     reciprocal_radius = 0.2
     unique_hkls, multiplicites, g_hkls = get_intensities_params(reciprocal_lattice, reciprocal_radius)
diff --git a/diffsims/utils/sim_utils.py b/diffsims/utils/sim_utils.py
index 72023398..69227cf8 100644
--- a/diffsims/utils/sim_utils.py
+++ b/diffsims/utils/sim_utils.py
@@ -292,11 +292,11 @@ def get_kinematical_intensities(
     # Define an intensity scaling that is linear with distance from Ewald sphere
     # along the beam direction.
 
-    if (all(excitation_error)!=None):
-        shape_factor = 1 - (excitation_error / max_excitation_error)
+    if excitation_error is None:
+        shape_factor = 1
 
     else:
-        shape_factor = 1
+        shape_factor = 1 - (excitation_error / max_excitation_error)
 
     # Calculate the peak intensities from the structure factor and excitation
     peak_intensities = multiplicites * (f_hkls * f_hkls.conjugate()).real * shape_factor