nqrduck/quackseq-simulator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved error handling.

Browse source
This commit is contained in:
jupfi 2025-01-02 15:19:03 +01:00
parent 5b26112aea
commit 1b7df939e0
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/quackseq_simulator/simulator_controller.py
View file

@ -5,7 +5,7 @@ from datetime import datetime
import numpy as np import numpy as np
from quackseq.spectrometer.spectrometer_controller import SpectrometerController from quackseq.spectrometer.spectrometer_controller import SpectrometerController
from quackseq.measurement import Measurement from quackseq.measurement import Measurement, MeasurementError
from quackseq.pulseparameters import TXPulse from quackseq.pulseparameters import TXPulse
from quackseq.pulsesequence import QuackSequence from quackseq.pulsesequence import QuackSequence
@ -22,7 +22,7 @@ class SimulatorController(SpectrometerController):
super().__init__() super().__init__()
self.simulator = simulator self.simulator = simulator
def run_sequence(self, sequence: QuackSequence) -> None: def run_sequence(self, sequence: QuackSequence) -> Measurement:
"""This method is called when the start_measurement signal is received from the core. """This method is called when the start_measurement signal is received from the core.
It will becalled if the simulator is the active spectrometer. It will becalled if the simulator is the active spectrometer.
@ -36,6 +36,10 @@ class SimulatorController(SpectrometerController):
# Get the number of phasecycles # Get the number of phasecycles
number_phasecycles = sequence.phase_table.n_phase_cycles number_phasecycles = sequence.phase_table.n_phase_cycles
if number_phasecycles == 0:
error = MeasurementError("Error", "Pulse sequence is not valid. Did you set an TX event?")
return error
# Empty measurement object # Empty measurement object
measurement_data = None measurement_data = None
@ -51,7 +55,8 @@ class SimulatorController(SpectrometerController):
pulse_array = self.translate_pulse_sequence(sequence, dwell_time, cycle) pulse_array = self.translate_pulse_sequence(sequence, dwell_time, cycle)
except AttributeError: except AttributeError:
logger.warning("Could not translate pulse sequence") logger.warning("Could not translate pulse sequence")
return error = MeasurementError("Error", "Could not translate pulse sequence")
return error
simulation = self.get_simulation(sample, pulse_array) simulation = self.get_simulation(sample, pulse_array)
@ -70,8 +75,8 @@ class SimulatorController(SpectrometerController):
evidx = np.where((tdx > rx_begin) & (tdx < rx_stop))[0] evidx = np.where((tdx > rx_begin) & (tdx < rx_stop))[0]
tdx = tdx[evidx] tdx = tdx[evidx]
result = result[evidx] result = result[evidx]
# Add empty second dimension to result so it has shape (n_points, 1)
# Add empty second dimension to result so it has shape (n_points, 1)
result = np.expand_dims(result, axis=1) result = np.expand_dims(result, axis=1)
# Measurement name date + module + target frequency + averages + sequence name # Measurement name date + module + target frequency + averages + sequence name