From 1a6342e4cb3ee5a351547dc389873f9ce8f20a15 Mon Sep 17 00:00:00 2001
From: jupfi <github@jupfi.me>
Date: Sat, 4 May 2024 21:55:43 +0200
Subject: [PATCH] Working RX dwelltime.

---
 .../controller.py                             | 31 ++++++++++++++++++
 src/nqrduck_spectrometer_limenqr/model.py     | 32 +++++++++++++------
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/src/nqrduck_spectrometer_limenqr/controller.py b/src/nqrduck_spectrometer_limenqr/controller.py
index b4db5e2..a478e6b 100644
--- a/src/nqrduck_spectrometer_limenqr/controller.py
+++ b/src/nqrduck_spectrometer_limenqr/controller.py
@@ -4,10 +4,12 @@ import logging
 import tempfile
 from pathlib import Path
 import numpy as np
+from scipy.signal import resample, decimate
 
 from limedriver.binding import PyLimeConfig
 from limedriver.hdf_reader import HDF
 
+from nqrduck.helpers.unitconverter import UnitConverter
 from nqrduck_spectrometer.base_spectrometer_controller import BaseSpectrometerController
 from nqrduck_spectrometer.measurement import Measurement
 from nqrduck_spectrometer.pulseparameters import TXPulse, RXReadout
@@ -55,6 +57,29 @@ class LimeNQRController(BaseSpectrometerController):
 
         measurement_data = self.process_measurement_results(lime)
 
+        # Resample the RX data to the dwell time settings
+        dwell_time = self.module.model.get_setting_by_name(
+            self.module.model.RX_DWELL_TIME
+        ).value
+        dwell_time = UnitConverter.to_float(dwell_time) * 1e6
+        logger.debug("Dwell time: %s", dwell_time)
+        logger.debug(f"Last tdx value: {measurement_data.tdx[-1]}")
+        if dwell_time:
+            n_data_points = int(measurement_data.tdx[-1] / dwell_time)
+            logger.debug("Resampling to %s data points", n_data_points)
+            tdx = np.linspace(
+                0, measurement_data.tdx[-1], n_data_points, endpoint=False
+            )
+            tdy = resample(measurement_data.tdy, n_data_points)
+            measurement_data = Measurement(
+                tdx,
+                tdy,
+                self.module.model.target_frequency,
+                IF_frequency=self.module.model.if_frequency,
+            )
+
+            
+
         if measurement_data:
             self.emit_measurement_data(measurement_data)
             self.emit_status_message("Finished Measurement")
@@ -456,6 +481,7 @@ class LimeNQRController(BaseSpectrometerController):
             parameter.get_option_by_name(TXPulse.RELATIVE_AMPLITUDE).value / 100
         )
         pulse_amplitude = np.clip(pulse_amplitude, -0.99, 0.99)
+
         return pulse_shape, pulse_amplitude
 
     def modulate_pulse_amplitude(
@@ -475,6 +501,11 @@ class LimeNQRController(BaseSpectrometerController):
         num_samples = int(float(event.duration) * lime.srate)
         tdx = np.linspace(0, float(event.duration), num_samples, endpoint=False)
         shift_signal = np.exp(1j * 2 * np.pi * self.module.model.if_frequency * tdx)
+
+        # The pulse amplitude needs to be resampled to the number of samples
+        logger.debug("Resampling pulse amplitude to %s samples", num_samples)
+        pulse_amplitude = resample(pulse_amplitude, num_samples)
+
         pulse_complex = pulse_amplitude * shift_signal
         modulated_amplitude = np.abs(pulse_complex)
         modulated_phase = self.unwrap_phase(np.angle(pulse_complex))
diff --git a/src/nqrduck_spectrometer_limenqr/model.py b/src/nqrduck_spectrometer_limenqr/model.py
index 30dc5c5..1b59695 100644
--- a/src/nqrduck_spectrometer_limenqr/model.py
+++ b/src/nqrduck_spectrometer_limenqr/model.py
@@ -8,6 +8,7 @@ from nqrduck_spectrometer.settings import (
     IntSetting,
     BooleanSetting,
     SelectionSetting,
+    StringSetting,
 )
 
 logger = logging.getLogger(__name__)
@@ -19,17 +20,18 @@ class LimeNQRModel(BaseSpectrometerModel):
     CHANNEL = "TX/RX Channel"
     TX_MATCHING = "TX Matching"
     RX_MATCHING = "RX Matching"
-    SAMPLING_FREQUENCY = "Sampling Frequency"
-    IF_FREQUENCY = "IF Frequency"
-    ACQUISITION_TIME = "Acquisition time"
+    SAMPLING_FREQUENCY = "Sampling Frequency (Hz)"
+    RX_DWELL_TIME = "RX Dwell Time (s)"
+    IF_FREQUENCY = "IF Frequency (Hz)"
+    ACQUISITION_TIME = "Acquisition time (s)"
     GATE_ENABLE = "Enable"
     GATE_PADDING_LEFT = "Gate padding left"
     GATE_PADDING_RIGHT = "Gate padding right"
     GATE_SHIFT = "Gate shift"
     RX_GAIN = "RX Gain"
     TX_GAIN = "TX Gain"
-    RX_LPF_BW = "RX LPF BW"
-    TX_LPF_BW = "TX LPF BW"
+    RX_LPF_BW = "RX LPF BW (Hz)"
+    TX_LPF_BW = "TX LPF BW (Hz)"
     TX_I_DC_CORRECTION = "TX I DC correction"
     TX_Q_DC_CORRECTION = "TX Q DC correction"
     TX_I_GAIN_CORRECTION = "TX I Gain correction"
@@ -79,15 +81,27 @@ class LimeNQRModel(BaseSpectrometerModel):
         )
         self.add_setting(rx_matching_setting, self.ACQUISITION)
 
-        sampling_frequency_setting = FloatSetting(
+
+        sampling_frequency_options = [
+            "30.72e6",
+            "15.36e6",
+            "7.68e6",
+        ]
+        sampling_frequency_setting = SelectionSetting(
             self.SAMPLING_FREQUENCY,
-            30.72e6,
+            sampling_frequency_options,
+            "30.72e6",
             "The rate at which the spectrometer samples the input signal.",
-            min_value=0,
-            max_value=30.72e6,
         )
         self.add_setting(sampling_frequency_setting, self.ACQUISITION)
 
+        rx_dwell_time_setting = StringSetting(
+            self.RX_DWELL_TIME,
+            "22n",
+            "The time between samples in the receive path.",
+        )
+        self.add_setting(rx_dwell_time_setting, self.ACQUISITION)
+
         if_frequency_setting = FloatSetting(
             self.IF_FREQUENCY,
             5e6,