mirror of
https://github.com/nqrduck/nqrduck-spectrometer-limenqr.git
synced 2024-09-19 09:40:34 +00:00
Started implementation of single freq. measurement
This commit is contained in:
jupfi
parent
ae2aff25a2
commit
ee971974cf
1 changed files with 89 additions and 70 deletions
|
|
@ -6,21 +6,26 @@ from pathlib import Path
|
|||
import numpy as np
|
||||
from nqrduck.module.module_controller import ModuleController
|
||||
from nqrduck_spectrometer.base_spectrometer_controller import BaseSpectrometerController
|
||||
from nqrduck_spectrometer.measurement import Measurement
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class LimeNQRController(BaseSpectrometerController):
|
||||
def __init__(self, module):
|
||||
super().__init__(module)
|
||||
|
||||
def start_measurement(self):
|
||||
logger.debug("Starting measurement with spectrometer: %s", self.module.model.name)
|
||||
logger.debug(
|
||||
"Starting measurement with spectrometer: %s", self.module.model.name
|
||||
)
|
||||
# Now we request the pulse sequence set in the pulse programmer module
|
||||
pulse_sequence = self.module.model.pulse_programmer.model.pulse_sequence
|
||||
logger.debug("Pulse sequence is: %s", pulse_sequence.dump_sequence_data())
|
||||
|
||||
try:
|
||||
from .contrib.limr import limr
|
||||
|
||||
self_path = Path(__file__).parent
|
||||
driver_path = str(self_path / "contrib/pulseN_test_USB.cpp")
|
||||
lime = limr(driver_path)
|
||||
|
|
@ -29,7 +34,6 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
except Exception as e:
|
||||
logger.error("Error while loading pulseN_test_USB.cpp: %s", e)
|
||||
|
||||
|
||||
lime.noi = -1 # No initialisation
|
||||
lime.nrp = 1 # Numer of repetitions
|
||||
|
||||
|
|
@ -66,36 +70,24 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
try:
|
||||
evidx = np.where((lime.HDF.tdx > evran[0]) & (lime.HDF.tdx < evran[1]))[0]
|
||||
except:
|
||||
print("error due to np.where evaluation!")
|
||||
logger.error("Error while reading the measurement data")
|
||||
return -1
|
||||
|
||||
# time domain x and y data
|
||||
tdx = lime.HDF.tdx[evidx]
|
||||
tdy = lime.HDF.tdy[evidx]
|
||||
tdy = lime.HDF.tdy[evidx] / lime.nav
|
||||
|
||||
#correcting a offset in the time domain by subtracting the mean
|
||||
tdy_mean = tdy[:,0]-np.mean(tdy)
|
||||
measurement_data = Measurement(tdx, tdy, self.module.model.target_frequency)
|
||||
|
||||
#fft of the corrected time domain data
|
||||
fdy1 = fftshift(fft(tdy_mean,axis=0),axes=0)
|
||||
|
||||
#fft freq and fft shift is here used to scale the x axis (frequency axis)
|
||||
fdx1 = fftfreq(len(fdy1))*lime.sra/1e6
|
||||
fdx1 = fftshift(fdx1)
|
||||
|
||||
#scaling factor which converts the y axis (usually a proportional number of points) into uV
|
||||
fac_p_to_uV = 447651/1e6
|
||||
|
||||
#tdy_mean = tdy_mean/l.nav/fac_p_to_uV/RX_gainfactor
|
||||
|
||||
|
||||
plt.figure(1);
|
||||
plt.plot(tdx,tdy_mean/lime.nav)
|
||||
plt.xlabel("t in µs")
|
||||
plt.ylabel("Amplitude / points")
|
||||
plt.show()
|
||||
# Emit the data to the nqrduck core
|
||||
logger.debug("Emitting measurement data")
|
||||
self.module.nqrduck_signal.emit("single_measurement", measurement_data)
|
||||
|
||||
def update_settings(self, lime):
|
||||
logger.debug("Updating settings for spectrometer: %s for measurement", self.module.model.name)
|
||||
logger.debug(
|
||||
"Updating settings for spectrometer: %s for measurement",
|
||||
self.module.model.name,
|
||||
)
|
||||
lime.t3d = [0, 0, 0, 0]
|
||||
for category in self.module.model.settings.keys():
|
||||
for setting in self.module.model.settings[category]:
|
||||
|
|
@ -109,7 +101,9 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
lime.sra = setting.get_setting()
|
||||
# Careful this doesn't only set the IF frequency but the local oscillator frequency
|
||||
elif setting.name == self.module.model.IF_FREQUENCY:
|
||||
lime.lof = self.module.model.target_frequency - setting.get_setting()
|
||||
lime.lof = (
|
||||
self.module.model.target_frequency - setting.get_setting()
|
||||
)
|
||||
self.module.model.if_frequency = setting.get_setting()
|
||||
elif setting.name == self.module.model.ACQUISITION_TIME:
|
||||
lime.tac = setting.get_setting()
|
||||
|
|
@ -171,10 +165,14 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
for event in events:
|
||||
logger.debug("Event %s has parameters: %s", event.name, event.parameters)
|
||||
for parameter in event.parameters.values():
|
||||
logger.debug("Parameter %s has options: %s", parameter.name, parameter.options)
|
||||
|
||||
if parameter.name == self.module.model.TX and parameter.options["TX Amplitude"].value > 0:
|
||||
logger.debug(
|
||||
"Parameter %s has options: %s", parameter.name, parameter.options
|
||||
)
|
||||
|
||||
if (
|
||||
parameter.name == self.module.model.TX
|
||||
and parameter.options["TX Amplitude"].value > 0
|
||||
):
|
||||
if len(lime.pfr) == 0:
|
||||
# Add the TX pulse to the pulse frequency list (lime.pfr)
|
||||
lime.pfr = [float(self.module.model.if_frequency)]
|
||||
|
|
@ -188,11 +186,17 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
# Add the TX pulse phase to the pulse phase list (lime.pph) -> not yet implemented
|
||||
else:
|
||||
logger.debug("Adding TX pulse to existing pulse sequence")
|
||||
logger.debug("Setting if frequency to: %s", self.module.model.if_frequency)
|
||||
logger.debug(
|
||||
"Setting if frequency to: %s",
|
||||
self.module.model.if_frequency,
|
||||
)
|
||||
lime.pfr.append(float(self.module.model.if_frequency))
|
||||
logger.debug("Setting pulse duration to: %s", event.duration)
|
||||
lime.pdr.append(float(event.duration))
|
||||
logger.debug("Setting pulse amplitude to: %s", parameter.options["TX Amplitude"].value)
|
||||
logger.debug(
|
||||
"Setting pulse amplitude to: %s",
|
||||
parameter.options["TX Amplitude"].value,
|
||||
)
|
||||
lime.pam.append(float(parameter.options["TX Amplitude"].value))
|
||||
# Get the length of the previous event without a tx pulse
|
||||
blank = []
|
||||
|
|
@ -200,11 +204,21 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
# Firstuful this is ugly as hell and needs to be refactored
|
||||
# Secondly this just sets the pulse offsets.
|
||||
for prev_event in previous_events[::-1]:
|
||||
logger.debug("Previous event: %s with duration: %s", prev_event.name, prev_event.duration)
|
||||
logger.debug(
|
||||
"Previous event: %s with duration: %s",
|
||||
prev_event.name,
|
||||
prev_event.duration,
|
||||
)
|
||||
for parameter in prev_event.parameters.values():
|
||||
if parameter.name == self.module.model.TX and parameter.options["TX Amplitude"].value == 0:
|
||||
if (
|
||||
parameter.name == self.module.model.TX
|
||||
and parameter.options["TX Amplitude"].value == 0
|
||||
):
|
||||
blank.append(float(prev_event.duration))
|
||||
elif parameter.name == self.module.model.TX and parameter.options["TX Amplitude"].value > 0:
|
||||
elif (
|
||||
parameter.name == self.module.model.TX
|
||||
and parameter.options["TX Amplitude"].value > 0
|
||||
):
|
||||
break
|
||||
else:
|
||||
continue
|
||||
|
|
@ -217,7 +231,6 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
logger.debug("Setting pulse offset to: %s", prev_duration)
|
||||
lime.pof.append(np.ceil(prev_duration * lime.sra))
|
||||
|
||||
|
||||
# The last event is the repetition time event
|
||||
lime.trp = float(event.duration)
|
||||
|
||||
|
|
@ -229,15 +242,23 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
CORRECTION_FACTOR = 2.2e-6
|
||||
events = self.module.model.pulse_programmer.model.pulse_sequence.events
|
||||
|
||||
previous_events_duration = []
|
||||
for event in events:
|
||||
logger.debug("Event %s has parameters: %s", event.name, event.parameters)
|
||||
for parameter in event.parameters.values():
|
||||
logger.debug("Parameter %s has options: %s", parameter.name, parameter.options)
|
||||
logger.debug(
|
||||
"Parameter %s has options: %s", parameter.name, parameter.options
|
||||
)
|
||||
|
||||
if parameter.name == self.module.model.RX and parameter.options['RX'].state:
|
||||
if (
|
||||
parameter.name == self.module.model.RX
|
||||
and parameter.options["RX"].state
|
||||
):
|
||||
# Get the length of all previous events
|
||||
previous_events = events[: events.index(event)]
|
||||
previous_events_duration = sum([event.duration for event in previous_events])
|
||||
previous_events_duration = sum(
|
||||
[event.duration for event in previous_events]
|
||||
)
|
||||
# Get the offset of the first pulse
|
||||
offset = self.module.model.OFFSET_FIRST_PULSE * (1 / lime.sra)
|
||||
rx_duration = event.duration
|
||||
|
|
@ -246,5 +267,3 @@ class LimeNQRController(BaseSpectrometerController):
|
|||
rx_stop = rx_begin + rx_duration
|
||||
|
||||
return rx_begin * 1e6, rx_stop * 1e6
|
||||
|
||||
|
||||
Loading…
Reference in a new issue