mirror of
https://github.com/nqrduck/quackseq-simulator.git
synced 2025-01-02 18:08:07 +00:00
Added phase information, made imports prettier.
This commit is contained in:
parent
b849624129
commit
39941d879a
1 changed files with 13 additions and 6 deletions
|
@ -9,9 +9,7 @@ from quackseq.measurement import Measurement
|
||||||
from quackseq.pulseparameters import TXPulse, RXReadout
|
from quackseq.pulseparameters import TXPulse, RXReadout
|
||||||
from quackseq.pulsesequence import QuackSequence
|
from quackseq.pulsesequence import QuackSequence
|
||||||
|
|
||||||
from nqr_blochsimulator.classes.pulse import PulseArray
|
from nqr_blochsimulator import Sample, Simulation, PulseArray
|
||||||
from nqr_blochsimulator.classes.sample import Sample
|
|
||||||
from nqr_blochsimulator.classes.simulation import Simulation
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -135,6 +133,8 @@ class SimulatorController(SpectrometerController):
|
||||||
events = sequence.events
|
events = sequence.events
|
||||||
|
|
||||||
amplitude_array = list()
|
amplitude_array = list()
|
||||||
|
phase_array = list()
|
||||||
|
|
||||||
for event in events:
|
for event in events:
|
||||||
logger.debug("Event %s has parameters: %s", event.name, event.parameters)
|
logger.debug("Event %s has parameters: %s", event.name, event.parameters)
|
||||||
for parameter in event.parameters.values():
|
for parameter in event.parameters.values():
|
||||||
|
@ -159,6 +159,13 @@ class SimulatorController(SpectrometerController):
|
||||||
)
|
)
|
||||||
|
|
||||||
amplitude_array.append(pulse_amplitude)
|
amplitude_array.append(pulse_amplitude)
|
||||||
|
|
||||||
|
# Phase stuff
|
||||||
|
phase = parameter.get_option_by_name(TXPulse.TX_PHASE).value
|
||||||
|
# Degrees to radians
|
||||||
|
phase = np.radians(phase)
|
||||||
|
phase_array.append([phase for _ in range(len(pulse_amplitude))])
|
||||||
|
|
||||||
elif (
|
elif (
|
||||||
parameter.name == sequence.TX_PULSE
|
parameter.name == sequence.TX_PULSE
|
||||||
and parameter.get_option_by_name(TXPulse.RELATIVE_AMPLITUDE).value
|
and parameter.get_option_by_name(TXPulse.RELATIVE_AMPLITUDE).value
|
||||||
|
@ -166,11 +173,11 @@ class SimulatorController(SpectrometerController):
|
||||||
):
|
):
|
||||||
# If we have a wait, we need to add it to the pulse array
|
# If we have a wait, we need to add it to the pulse array
|
||||||
amplitude_array.append(np.zeros(int(event.duration / dwell_time)))
|
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)
|
amplitude_array = np.concatenate(amplitude_array)
|
||||||
|
phase_array = np.concatenate(phase_array)
|
||||||
# This has not yet been implemented right now the phase is always 0
|
|
||||||
phase_array = np.zeros(len(amplitude_array))
|
|
||||||
|
|
||||||
pulse_array = PulseArray(
|
pulse_array = PulseArray(
|
||||||
pulseamplitude=amplitude_array,
|
pulseamplitude=amplitude_array,
|
||||||
|
|
Loading…
Reference in a new issue