remove clock_rate_lookup_by_sample_rate, remove unused import

scos_actions/actions/calibrate_y_factor.py

@@ -231,14 +231,12 @@ def __call__(self, sensor: Sensor, schedule_entry: dict, task_id: int):
             logger.debug(f"cal_params: {cal_params}")
             cal_data = dict()
             last_cal_datetime = get_datetime_str_now()
-            clock_rate_lookup_by_sample_rate = []
             self.sensor.sensor_calibration = SensorCalibration(
                 calibration_parameters=cal_params,
                 calibration_data=cal_data,
                 calibration_reference=onboard_cal_reference,
                 file_path=Path(env("ONBOARD_CALIBRATION_FILE")),
                 last_calibration_datetime=last_cal_datetime,
-                clock_rate_lookup_by_sample_rate=clock_rate_lookup_by_sample_rate,
                 sensor_uid=sensor_uid,
             )
         elif self.sensor.sensor_calibration.file_path == env(

scos_actions/calibration/sensor_calibration.py

@@ -25,16 +25,8 @@ class provides an implementation for the update method to allow calibration
     """
 
     last_calibration_datetime: str
-    clock_rate_lookup_by_sample_rate: List[Dict[str, float]]
     sensor_uid: str
 
-    def get_clock_rate(self, sample_rate: Union[float, int]) -> Union[float, int]:
-        """Find the clock rate (Hz) using the given sample_rate (samples per second)"""
-        for mapping in self.clock_rate_lookup_by_sample_rate:
-            if mapping["sample_rate"] == sample_rate:
-                return mapping["clock_frequency"]
-        return sample_rate
-
     def update(
         self,
         params: dict,

scos_actions/calibration/tests/test_calibration.py

@@ -103,7 +103,6 @@ def test_to_and_from_json(self, tmp_path: Path):
             "testing",
             tmp_path / "testing.json",
             "dt_str",
-            [],
             "uid",
         )
         sensor_cal.to_json()

scos_actions/calibration/tests/test_sensor_calibration.py

@@ -83,17 +83,6 @@ def setup_calibration_file(self, tmp_path: Path):
         cal_data["sensor_uid"] = "SAMPLE_CALIBRATION"
         cal_data["calibration_reference"] = "TESTING"
 
-        # Add SR/CF lookup table
-        cal_data["clock_rate_lookup_by_sample_rate"] = []
-        for sr in self.sample_rates:
-            cr = sr
-            while cr <= 40e6:
-                cr *= 2
-            cr /= 2
-            cal_data["clock_rate_lookup_by_sample_rate"].append(
-                {"sample_rate": int(sr), "clock_frequency": int(cr)}
-            )
-
         # Create the JSON architecture for the calibration data
         cal_data["calibration_data"] = {}
         cal_data["calibration_parameters"] = ["sample_rate", "frequency", "gain"]
@@ -151,7 +140,6 @@ def test_sensor_calibration_dataclass_fields(self):
         # Note: does not check field order
         assert fields == {
             "last_calibration_datetime": str,
-            "clock_rate_lookup_by_sample_rate": List[Dict[str, float]],
             "sensor_uid": str,
         }
 
@@ -167,13 +155,6 @@ def test_field_validator(self):
                 [], {}, False, Path(""), datetime.datetime.now(), [], "uid"
             )
 
-    def test_get_clock_rate(self):
-        """Test the get_clock_rate method"""
-        # Test getting a clock rate by sample rate
-        assert self.sample_cal.get_clock_rate(10e6) == 40e6
-        # If there isn't an entry, the sample rate should be returned
-        assert self.sample_cal.get_clock_rate(-999) == -999
-
     def test_get_calibration_dict_exact_match_lookup(self):
         calibration_datetime = get_datetime_str_now()
         calibration_params = ["sample_rate", "frequency"]
@@ -187,7 +168,6 @@ def test_get_calibration_dict_exact_match_lookup(self):
             calibration_reference="testing",
             file_path=Path(""),
             last_calibration_datetime=calibration_datetime,
-            clock_rate_lookup_by_sample_rate=[],
             sensor_uid="TESTING",
         )
         cal_data = cal.get_calibration_dict({"sample_rate": 100.0, "frequency": 200.0})
@@ -206,7 +186,6 @@ def test_get_calibration_dict_within_range(self):
             calibration_reference="testing",
             file_path=Path("test_calibration.json"),
             last_calibration_datetime=calibration_datetime,
-            clock_rate_lookup_by_sample_rate=[],
             sensor_uid="TESTING",
         )
 
@@ -234,7 +213,6 @@ def test_update(self):
             calibration_reference="testing",
             file_path=test_cal_path,
             last_calibration_datetime=calibration_datetime,
-            clock_rate_lookup_by_sample_rate=[],
             sensor_uid="TESTING",
         )
         action_params = {"sample_rate": 100.0, "frequency": 200.0}

scos_actions/hardware/sensor.py

@@ -9,7 +9,6 @@
 from its_preselector.web_relay import WebRelay
 
 from scos_actions.calibration.differential_calibration import DifferentialCalibration
-from scos_actions.calibration.interfaces.calibration import Calibration
 from scos_actions.calibration.sensor_calibration import SensorCalibration
 from scos_actions.hardware.gps_iface import GPSInterface
 from scos_actions.hardware.sigan_iface import SignalAnalyzerInterface