nqrduck/quackseq-simulator
1
0
Fork 0
mirror of https://github.com/nqrduck/quackseq-simulator.git synced 2025-01-02 18:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Working PhaseCycling.

Browse source
This commit is contained in:
jupfi 2024-06-07 16:48:45 +02:00
parent 471c9e52be
commit 0720f19d87
2 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/quackseq_simulator/simulator_controller.py
View file

@ -29,17 +29,26 @@ class SimulatorController(SpectrometerController):
This will start the simulation based on the settings and the pulse sequence.
"""
logger.debug("Starting simulation")
sample = self.get_sample_from_settings()
logger.debug("Sample: %s", sample.name)
# This needs to be called to update the phase array
sequence.phase_table.update_phase_array()
# Get the number of phasecycles
number_phasecycles = sequence.phase_table.n_phase_cycles
# Empty measurement object
measurement_data = None
for cycle in range(number_phasecycles):
sample = self.get_sample_from_settings()
logger.debug("Sample: %s", sample.name)
dwell_time = self.calculate_dwelltime(sequence)
logger.debug("Dwell time: %s", dwell_time)
try:
pulse_array = self.translate_pulse_sequence(sequence, dwell_time)
pulse_array = self.translate_pulse_sequence(sequence, dwell_time, cycle)
except AttributeError:
logger.warning("Could not translate pulse sequence")
return
@ -66,16 +75,18 @@ class SimulatorController(SpectrometerController):
name = f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')} - Simulator - {self.simulator.model.target_frequency / 1e6} MHz - {self.simulator.model.averages} averages - {sequence.name}"
logger.debug(f"Measurement name: {name}")
if not measurement_data:
measurement_data = Measurement(
name,
tdx,
result / simulation.averages,
sample.resonant_frequency,
# frequency_shift=self.module.model.if_frequency,
)
else:
measurement_data.add_dataset(tdx, result / simulation.averages)
if phase:
measurement_data.phase_shift(phase, 0)
measurement_data.phase_shift(phase, cycle)
return measurement_data
@ -127,13 +138,14 @@ class SimulatorController(SpectrometerController):
return sample
def translate_pulse_sequence(
self, sequence: QuackSequence, dwell_time: float
self, sequence: QuackSequence, dwell_time: float, cycle: int
) -> PulseArray:
"""This method translates the pulse sequence from the core to a PulseArray object needed for the simulation.
Args:
sequence (QuackSequence): The pulse sequence from the core.
dwell_time (float): The dwell time in seconds.
cycle (int): The current phase cycle.
Returns:
PulseArray: The pulse sequence translated to a PulseArray object.
@ -143,6 +155,12 @@ class SimulatorController(SpectrometerController):
amplitude_array = list()
phase_array = list()
# Get the phase_table
phase_table = sequence.phase_table.phase_array[cycle]
# Count the number of TX pulses with relative amplitude > 0
n_tx_pulses = 0
for event in events:
logger.debug("Event %s has parameters: %s", event.name, event.parameters)
for parameter in event.parameters.values():
@ -156,6 +174,7 @@ class SimulatorController(SpectrometerController):
> 0
):
logger.debug(f"Adding pulse: {event.duration} s")
# If we have a pulse, we need to add it to the pulse array
pulse_shape = parameter.get_option_by_name(
TXPulse.TX_PULSE_SHAPE
@ -168,11 +187,12 @@ class SimulatorController(SpectrometerController):
amplitude_array.append(pulse_amplitude)
# Phase stuff
phase = parameter.get_option_by_name(TXPulse.TX_PHASE).value
# Phase from the phase table - column is the number of the pulse
phase = phase_table[n_tx_pulses]
# Degrees to radians
phase = np.radians(phase)
phase_array.append([phase for _ in range(len(pulse_amplitude))])
n_tx_pulses += 1
elif (
parameter.name == sequence.TX_PULSE
@ -183,7 +203,6 @@ class SimulatorController(SpectrometerController):
amplitude_array.append(np.zeros(int(event.duration / dwell_time)))
phase_array.append(np.zeros(int(event.duration / dwell_time)))
amplitude_array = np.concatenate(amplitude_array)
phase_array = np.concatenate(phase_array)

16
tests/simulator.py
View file

@ -93,14 +93,14 @@ class TestQuackSequence(unittest.TestCase):
seq.add_event(tx2)
seq.set_tx_amplitude(tx2, 100)
seq.set_tx_phase(tx2, 1)
seq.set_tx_n_phase_cycles(tx2, 4)
seq.set_tx_n_phase_cycles(tx2, 2)
seq.set_tx_phase_cycle_group(tx2, 1)
tx3 = Event("tx3", "10u", seq)
seq.add_event(tx3)
seq.set_tx_amplitude(tx3, 100)
seq.set_tx_phase(tx3, 2)
seq.set_tx_n_phase_cycles(tx3, 3)
seq.set_tx_n_phase_cycles(tx3, 2)
seq.set_tx_phase_cycle_group(tx3, 3)
sim = Simulator()
@ -109,12 +109,13 @@ class TestQuackSequence(unittest.TestCase):
result = sim.run_sequence(seq)
plt.plot(result.tdx[0], abs(result.tdy[0]))
plt.plot(result.tdx[1], abs(result.tdy[1]))
plt.show()
phase_table = PhaseTable(seq)
logger.info(phase_table.n_phase_cycles)
self.assertEqual(phase_table.n_phase_cycles, 24)
self.assertEqual(phase_table.n_phase_cycles, 8)
self.assertEqual(phase_table.n_parameters, 3)
def test_phase_cycling(self):
@ -152,12 +153,13 @@ class TestQuackSequence(unittest.TestCase):
phase_table.rx_phase_sign = readout_scheme
result = Simulator().run_sequence(seq)
plt.title("Phase cycling")
plt.plot(result.tdx[0], abs(result.tdy[0]), label="abs")
plt.plot(result.tdx[0], result.tdy[0].real, label="real")
plt.plot(result.tdx[0], result.tdy[0].imag, label="imag")
logger.info(f"Number of data sets {len(result.tdy)}")
plt.plot(result.tdx[0], result.tdy[0].real, label="pc 1")
plt.plot(result.tdx[1], result.tdy[1].real, label="pc 2")
plt.plot(result.tdx[2], result.tdy[2].real, label="pc 3")
plt.plot(result.tdx[3], result.tdy[3].real, label="pc 4")
plt.legend()
plt.show()
# rx = Event("rx", "100u", seq)