including changes from main (forgot to pull)

rosalindfranklininstitute · Dec 1, 2022 · 4d2a259 · 4d2a259
1 parent 2d951e7
commit 4d2a259
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/src/quoll/frc/oneimg.py b/src/quoll/frc/oneimg.py
@@ -90,6 +90,9 @@ def miplib_oneimg_FRC_calibrated(
     # Apply correction
     if calibration_func is not None:
         frc_data[0].correlation["frequency"] = calibration_func(freqs)
+
+    else:
+        frc_data[0].correlation["frequency"] = freqs
 
     # Analyze results
     analyzer = frc_analysis.FourierCorrelationAnalysis(

diff --git a/tests/test_frc_oneimg.py b/tests/test_frc_oneimg.py
@@ -93,27 +93,10 @@ def test_set_calibration_func(self):
         In this test, calibration function is set to return the exact same 
         value, so the result should be equal to uncalibrated.
         """
-        Img = reader.Image("./data/042.tif")
-        result_calibrated = oneimg.calc_frc_res(
-            Image=Img,
-            calibration_func=lambda x: x  # just return original value
-        )
-        result_uncalibrated = oneimg.calc_frc_res(
-            Image=Img,
-            calibration_func=None
+        Img = reader.Image(
+            filename="./data/042.tif",
+            pixel_size=3.3724
         )
-        self.assertAlmostEqual(
-            result_calibrated.resolution["resolution"], 
-            result_uncalibrated.resolution["resolution"])
-        self.assertIsNotNone(result_calibrated.resolution["resolution"])
-        self.assertIsNotNone(result_uncalibrated.resolution["resolution"])
-    def test_set_calibration_func(self):
-        """
-        Tests that calibration function can be set to a custom function
-        In this test, calibration function is set to return the exact same 
-        value, so the result should be equal to uncalibrated.
-        """
-        Img = reader.Image("./data/042.tif")
         result_calibrated = oneimg.calc_frc_res(
             Image=Img,
             calibration_func=lambda x: x  # just return original value