Ruff tidyup of tests, update argument names

Author: ajjackson

tests/unit_tests/test_ideal_instrument.py

@@ -122,7 +122,7 @@ def test_bad_width_boxcar():
     - boxcar values are normalised based on _actual_ kernel area
     """
     result, _ = _get_data("boxcar", Feature.KERNEL, case_name="bad_width_kernel")
-    assert_allclose(result, np.load(DATA_PATH / f"_get_boxcar_kernel.npy"))
+    assert_allclose(result, np.load(DATA_PATH / "_get_boxcar_kernel.npy"))
 
 
 def test_bad_width_triangle():
@@ -133,7 +133,7 @@ def test_bad_width_triangle():
     """
     result, mesh = _get_data("triangle", Feature.KERNEL, case_name="bad_width_kernel")
 
-    ref_triangle = np.load(DATA_PATH / f"_get_triangle_kernel.npy")
+    ref_triangle = np.load(DATA_PATH / "_get_triangle_kernel.npy")
 
     assert np.flatnonzero(result).tolist() == np.flatnonzero(ref_triangle).tolist()
 
@@ -151,7 +151,7 @@ def test_bad_width_trapezoid():
     """
     result, mesh = _get_data("trapezoid", Feature.PEAK, case_name="bad_width_peak")
 
-    ref = np.load(DATA_PATH / f"_get_trapezoid_peak.npy")
+    ref = np.load(DATA_PATH / "_get_trapezoid_peak.npy")
 
     # Same non-zero points
     assert np.flatnonzero(result).tolist() == np.flatnonzero(ref).tolist()

tests/unit_tests/test_instrument.py

@@ -3,11 +3,11 @@
 from pathlib import Path
 import typing
 
+import numpy as np
 import pytest
 import yaml
 
 from resins import instrument as i
-from resins.models import MODELS
 from resins.models.model_base import ModelData, InstrumentModel
 
 
@@ -45,22 +45,19 @@ def __init__(self,
         self.kwarg1 = kwarg1
         self.kwarg2 = kwarg2
 
-    def get_characteristics(self, energy_transfer):
-        return {}
-
     def __call__(self, frequencies, *args, **kwargs):
         return frequencies
 
-    def get_characteristics(self, omega_q):
-        return {"sigma": np.ones((len(omega_q), 1))}
+    def get_characteristics(self, points):
+        return {"sigma": np.ones((len(points), 1))}
 
-    def get_kernel(self, omega_q, mesh):
+    def get_kernel(self, points, mesh):
         return np.zeros_like(mesh)
 
-    def get_peak(self, omega_q, mesh):
+    def get_peak(self, points, mesh):
         return np.zeros_like(mesh)
 
-    def broaden(self, omega_q, data, mesh):
+    def broaden(self, points, data, mesh):
         return np.zeros_like(mesh)
 
 

tests/unit_tests/test_mixins.py

@@ -2,7 +2,6 @@
 
 import numpy as np
 from numpy.testing import assert_allclose
-import pytest
 
 from resins.models.mixins import GaussianKernel1DMixin, SimpleBroaden1DMixin