diff --git a/scos_actions/__init__.py b/scos_actions/__init__.py index ab649641..b7a5e079 100644 --- a/scos_actions/__init__.py +++ b/scos_actions/__init__.py @@ -1 +1 @@ -__version__ = "10.0.1" +__version__ = "10.0.2" diff --git a/scos_actions/actions/acquire_single_freq_tdomain_iq.py b/scos_actions/actions/acquire_single_freq_tdomain_iq.py index faa3ece9..9995b5ca 100644 --- a/scos_actions/actions/acquire_single_freq_tdomain_iq.py +++ b/scos_actions/actions/acquire_single_freq_tdomain_iq.py @@ -78,10 +78,11 @@ def __init__(self, parameters: dict): self.frequency_Hz = get_parameter(FREQUENCY, self.parameters) self.classification = get_parameter(CLASSIFICATION, self.parameters) self.cal_adjust = get_parameter(CAL_ADJUST, self.parameters) + self.requested_sample_rate = get_parameter(SAMPLE_RATE, self.parameters) def execute(self, schedule_entry: dict, task_id: int) -> dict: # Use the sigan's actual reported instead of requested sample rate - sample_rate = self.sensor.signal_analyzer.sample_rate + sample_rate = self.requested_sample_rate num_samples = int(sample_rate * self.duration_ms * 1e-3) measurement_result = self.acquire_data( num_samples, self.nskip, self.cal_adjust, cal_params=self.parameters diff --git a/scos_actions/actions/acquire_stepped_freq_tdomain_iq.py b/scos_actions/actions/acquire_stepped_freq_tdomain_iq.py index 6fd4c685..f29f8eac 100644 --- a/scos_actions/actions/acquire_stepped_freq_tdomain_iq.py +++ b/scos_actions/actions/acquire_stepped_freq_tdomain_iq.py @@ -45,6 +45,7 @@ DURATION_MS, FREQUENCY, NUM_SKIP, + SAMPLE_RATE, SingleFrequencyTimeDomainIqAcquisition, ) from scos_actions.hardware.sensor import Sensor @@ -98,7 +99,7 @@ def __call__(self, sensor: Sensor, schedule_entry: dict, task_id: int): duration_ms = get_parameter(DURATION_MS, measurement_params) nskip = get_parameter(NUM_SKIP, measurement_params) cal_adjust = get_parameter(CAL_ADJUST, measurement_params) - sample_rate = self.sensor.signal_analyzer.sample_rate + sample_rate = get_parameter(SAMPLE_RATE, measurement_params) num_samples = int(sample_rate * duration_ms * 1e-3) measurement_result = super().acquire_data( num_samples, nskip, cal_adjust, cal_params=measurement_params