Raise exception if attempting to calibrate without iir filter with de…

…fault cal file.

scos_actions/actions/calibrate_y_factor.py

@@ -78,7 +78,7 @@
 
 from scos_actions import utils
 from scos_actions.actions.interfaces.action import Action
-from scos_actions.calibration import sensor_calibration
+from scos_actions.calibration import sensor_calibration, default_sensor_calibration
 from scos_actions.hardware.mocks.mock_gps import MockGPS
 from scos_actions.hardware.sigan_iface import SIGAN_SETTINGS_KEYS
 from scos_actions.settings import SENSOR_CALIBRATION_FILE
@@ -262,6 +262,11 @@ def calibrate(self, params):
             noise_on_data = sosfilt(self.iir_sos, noise_on_measurement_result["data"])
             noise_off_data = sosfilt(self.iir_sos, noise_off_measurement_result["data"])
         else:
+            if default_sensor_calibration:
+                raise Exception(
+                    "Calibrations without IIR filter cannot be performed with default calibration."
+                )
+
             logger.debug("Skipping IIR filtering")
             # Get ENBW from sensor calibration
             assert set(sensor_calibration.calibration_parameters) <= set(

scos_actions/calibration/__init__.py

@@ -20,7 +20,6 @@ def get_sigan_calibration(sigan_cal_file: str) -> Calibration:
     :return: The signal analyzer ``Calibration`` object.
     """
     try:
-        check_for_default_calibration(sigan_cal_file, "Sigan")
         sigan_cal = load_from_json(sigan_cal_file)
     except Exception:
         sigan_cal = None
@@ -37,19 +36,21 @@ def get_sensor_calibration(sensor_cal_file: str) -> Calibration:
     :return: The sensor ``Calibration`` object.
     """
     try:
-        check_for_default_calibration(sensor_cal_file, "Sensor")
         sensor_cal = load_from_json(sensor_cal_file)
     except Exception:
         sensor_cal = None
         logger.exception("Unable to load sensor calibration data, reverting to none")
     return sensor_cal
 
 
-def check_for_default_calibration(cal_file_path: str, cal_type: str):
+def check_for_default_calibration(cal_file_path: str, cal_type: str) -> bool:
+    default_cal = False
     if cal_file_path == DEFAULT_CALIBRATION_FILE:
+        default_cal = True
         logger.warning(
             f"***************LOADING DEFAULT {cal_type} CALIBRATION***************"
         )
+    return default_cal
 
 
 sensor_calibration = None
@@ -62,6 +63,9 @@ def check_for_default_calibration(cal_file_path: str, cal_type: str):
     )
 else:
     logger.debug(f"Loading sensor cal file: {SENSOR_CALIBRATION_FILE}")
+    default_sensor_calibration = check_for_default_calibration(
+        SENSOR_CALIBRATION_FILE, "Sensor"
+    )
     sensor_calibration = get_sensor_calibration(SENSOR_CALIBRATION_FILE)
 
 sigan_calibration = None
@@ -73,6 +77,9 @@ def check_for_default_calibration(cal_file_path: str, cal_type: str):
     )
 else:
     logger.debug(f"Loading sigan cal file: {SIGAN_CALIBRATION_FILE}")
+    default_sigan_calibration = check_for_default_calibration(
+        SIGAN_CALIBRATION_FILE, "Sigan"
+    )
     sigan_calibration = get_sigan_calibration(SIGAN_CALIBRATION_FILE)
 
 if sensor_calibration:

scos_actions/settings.py

@@ -1,4 +1,5 @@
 import logging
+from os import path
 from pathlib import Path
 
 from django.conf import settings
@@ -12,7 +13,7 @@
 ACTION_DEFINITIONS_DIR = CONFIG_DIR / "actions"
 
 if not settings.configured or not hasattr(settings, "DEFAULT_CALIBRATION_FILE"):
-    DEFAULT_CALIBRATION_FILE = ""
+    DEFAULT_CALIBRATION_FILE = path.join(CONFIG_DIR, "default_calibration.json")
 else:
     DEFAULT_CALIBRATION_FILE = settings.DEFAULT_CALIBRATION_FILE