Refactor: Fix tests and bring to 100%

Author: CSSFrancis

diffsims/generators/simulation_generator.py

@@ -310,7 +310,7 @@ def calculate_diffraction1d(
 
         # Scale intensities so that the max intensity is 100.
 
-        max_intensity = max([v[0] for v in peaks.values()])
+        max_intensity = max([v[1][0] for v in peaks])
         reciporical_spacing = []
         intensities = []
         hkls = []

diffsims/tests/generators/test_simulation_generator.py

@@ -246,6 +246,16 @@ def test_multiphase_multirotation_simulation():
     )
 
 
+def test_multiphase_multirotation_simulation_error():
+    generator = SimulationGenerator(300)
+    silicon = make_phase(5)
+    big_silicon = make_phase(10)
+    rot = Rotation.from_euler([[0, 0, 0], [0.1, 0.1, 0.1]])
+    rot2 = Rotation.from_euler([[0, 0, 0], [0.1, 0.1, 0.1], [0.2, 0.2, 0.2]])
+    with pytest.raises(ValueError):
+        sim = generator.calculate_diffraction2d([silicon, big_silicon], rotation=[rot])
+
+
 @pytest.mark.parametrize("scattering_param", ["lobato", "xtables"])
 def test_param_check(scattering_param):
     generator = SimulationGenerator(300, scattering_params=scattering_param)

diffsims/tests/simulations/test_simulations2d.py

@@ -213,7 +213,7 @@ def test_get_simulation(self, multi_simulation):
             assert phase == 0
 
     def test_get_current_rotation(self, multi_simulation):
-        rot = multi_simulation.get_current_rotation()
+        rot = multi_simulation.get_current_rotation_matrix()
         np.testing.assert_array_equal(rot, multi_simulation.rotations[0].to_matrix()[0])
 
     def test_init(self, multi_simulation):