From 0aabd502d7ff61cacb54d4131085ecd74bf92a80 Mon Sep 17 00:00:00 2001
From: Sander de Snoo <59472150+sldesnoo-Delft@users.noreply.github.com>
Date: Mon, 10 Jul 2023 11:46:33 +0200
Subject: [PATCH] Render wave of add_sin() with phase starting at start of
wave, i.e. independent of start time of pulse
---
pulse_lib/keysight/qs_sequence.py | 8 +++----
pulse_lib/qblox/pulsar_uploader.py | 8 +++++--
pulse_lib/segments/data_classes/data_IQ.py | 9 +++++++-
pulse_lib/segments/data_classes/data_pulse.py | 22 ++++++++++++-------
pulse_lib/segments/segment_pulse.py | 8 ++++---
pulse_lib/tests/utils/last_upload.py | 2 +-
6 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/pulse_lib/keysight/qs_sequence.py b/pulse_lib/keysight/qs_sequence.py
index 357af09d..914a750f 100644
--- a/pulse_lib/keysight/qs_sequence.py
+++ b/pulse_lib/keysight/qs_sequence.py
@@ -205,8 +205,8 @@ class IQSequenceBuilder:
if abs(frequency) > 450e6:
raise Exception(f'Waveform NCO frequency {frequency/1e6:5.1f} MHz is out of range')
- prephase += mw_pulse_data.start_phase
- postphase -= mw_pulse_data.start_phase
+ prephase += mw_pulse_data.phase_offset
+ postphase -= mw_pulse_data.phase_offset
return Waveform(mw_pulse_data.amplitude, amp_envelope,
frequency, pm_envelope,
prephase, postphase, duration)
@@ -216,8 +216,8 @@ class IQSequenceBuilder:
if abs(frequency) > 450e6:
raise Exception(f'Waveform NCO frequency {frequency/1e6:5.1f} MHz is out of range')
- prephase = mw_pulse_data.start_phase
- postphase = -mw_pulse_data.start_phase
+ prephase = mw_pulse_data.phase_offset
+ postphase = -mw_pulse_data.phase_offset
start_wvf = Waveform(mw_pulse_data.amplitude, 1.0,
frequency, 0.0,
prephase=prephase,
diff --git a/pulse_lib/qblox/pulsar_uploader.py b/pulse_lib/qblox/pulsar_uploader.py
index 8b8774fc..ea51f290 100644
--- a/pulse_lib/qblox/pulsar_uploader.py
+++ b/pulse_lib/qblox/pulsar_uploader.py
@@ -620,7 +620,11 @@ class UploadAggregator:
t_end = e.stop + seg_start
wave_duration = iround(e.stop) - iround(e.start) # 1 ns resolution
amod, phmod = get_modulation(e.envelope, wave_duration)
- sinewave = SineWaveform(wave_duration, e.frequency, e.start_phase, amod, phmod)
+ if e.coherent_pulsing:
+ phase = e.phase_offset + 2*np.pi*e.frequency*t*1e-9
+ else:
+ phase = e.phase_offset
+ sinewave = SineWaveform(wave_duration, e.frequency, phase, amod, phmod)
seq.add_sin(t, t_end, e.amplitude*scaling, sinewave)
elif isinstance(e, PhaseShift):
raise Exception('Phase shift not supported for AWG channel')
@@ -690,7 +694,7 @@ class UploadAggregator:
wave_duration = iround(e.stop - e.start) # 1 ns resolution for waveform
amod, phmod = get_modulation(e.envelope, wave_duration)
sinewave = SineWaveform(wave_duration, e.frequency-lo_freq,
- e.start_phase, amod, phmod)
+ e.phase_offset, amod, phmod)
seq.pulse(t_start, t_end, e.amplitude*scaling, sinewave)
elif isinstance(e, PhaseShift):
t_start = e.start + seg_start
diff --git a/pulse_lib/segments/data_classes/data_IQ.py b/pulse_lib/segments/data_classes/data_IQ.py
index 9b49fff2..673bf4e0 100644
--- a/pulse_lib/segments/data_classes/data_IQ.py
+++ b/pulse_lib/segments/data_classes/data_IQ.py
@@ -111,9 +111,16 @@ class IQ_data_single:
stop : float = 0
amplitude : float = 1
frequency : float = 0
- start_phase : float = 0
+ phase_offset : float = 0
+ ''' offset from coherent pulse '''
envelope : envelope_generator = None
ref_channel : str = None
+ coherent_pulsing : bool = True
+
+ @property
+ def start_phase(self):
+ ''' Old name for phase_offset '''
+ return self.phase_offset
@dataclass
class Chirp:
diff --git a/pulse_lib/segments/data_classes/data_pulse.py b/pulse_lib/segments/data_classes/data_pulse.py
index f3f9a51a..13a1cad2 100644
--- a/pulse_lib/segments/data_classes/data_pulse.py
+++ b/pulse_lib/segments/data_classes/data_pulse.py
@@ -356,7 +356,7 @@ class pulse_data(parent_data):
return
for mw_pulse in self.MW_pulse_data:
- mw_pulse.start_phase += phase_shift
+ mw_pulse.phase_offset += phase_shift
for chirp in self.chirp_data:
chirp.phase += phase_shift
@@ -715,7 +715,7 @@ class pulse_data(parent_data):
if abs(freq) > sample_rate*1e9/2:
raise Exception(f'Frequency {freq*1e-6:5.1f} MHz is above Nyquist frequency ({sample_rate*1e3/2} MHz)')
# TODO add check on configurable bandwidth.
- phase = mw_pulse.start_phase
+ phase = mw_pulse.phase_offset
if ref_channel_states and mw_pulse.ref_channel in ref_channel_states.start_phase:
ref_start_time = ref_channel_states.start_time
ref_start_phase = ref_channel_states.start_phase[mw_pulse.ref_channel]
@@ -745,10 +745,16 @@ class pulse_data(parent_data):
start_pt = iround(start_pulse * sample_rate)
stop_pt = start_pt + n_pt
- # add the sin pulse
- total_phase = phase_shift + phase + phase_envelope + ref_start_phase
- t = start_pt+ref_start_time/sample_rate + np.arange(n_pt)
- wvf[start_pt:stop_pt] += amp*amp_envelope*np.sin(2*np.pi*freq/sample_rate*1e-9*t + total_phase)
+ # add the sine wave
+ if mw_pulse.coherent_pulsing:
+ total_phase = phase_shift + phase + phase_envelope + ref_start_phase
+ t = start_pt+ref_start_time/sample_rate + np.arange(n_pt)
+ wvf[start_pt:stop_pt] += amp*amp_envelope*np.sin(2*np.pi*freq/sample_rate*1e-9*t + total_phase)
+ else:
+ # it's not an IQ pulse, but a sine wave on voltage channel.
+ total_phase = phase + phase_envelope
+ t = np.arange(n_pt)
+ wvf[start_pt:stop_pt] += amp*amp_envelope*np.sin(2*np.pi*freq/sample_rate*1e-9*t + total_phase)
for custom_pulse in self.custom_pulse_data:
data = custom_pulse.render(sample_rate*1e9)
@@ -830,7 +836,7 @@ class pulse_data(parent_data):
# max amp, freq and phase.
amp = mw_pulse.amplitude
freq = mw_pulse.frequency
- phase = mw_pulse.start_phase
+ phase = mw_pulse.phase_offset
if ref_channel_states and mw_pulse.ref_channel in ref_channel_states.start_phase:
ref_start_time = ref_channel_states.start_time
ref_start_phase = ref_channel_states.start_phase[mw_pulse.ref_channel]
@@ -910,7 +916,7 @@ class pulse_data(parent_data):
pd['stop'] = pulse.stop
pd['amplitude'] = pulse.amplitude
pd['frequency'] = pulse.frequency
- pd['start_phase'] = pulse.start_phase + phase_shift
+ pd['start_phase'] = pulse.phase_offset + phase_shift
envelope = pulse.envelope
if envelope is None:
envelope = envelope_generator()
diff --git a/pulse_lib/segments/segment_pulse.py b/pulse_lib/segments/segment_pulse.py
index 9883476b..2c888877 100644
--- a/pulse_lib/segments/segment_pulse.py
+++ b/pulse_lib/segments/segment_pulse.py
@@ -113,8 +113,9 @@ class segment_pulse(segment_base):
@loop_controller
def add_sin(self, start, stop, amp, freq, phase_offset=0):
'''
- add a sinus to the current segment, parameters should be self exlenatory.
- The pulse will have a not have a relative phase phase.
+ Adds a sine wave to the current segment.
+ The pulse does not have a coherent phase with other pulses,
+ unlike add_MW_pulse on IQ channels.
Args:
start (double) : start time in ns of the pulse
stop (double) : stop time in ns of the pulse
@@ -127,7 +128,8 @@ class segment_pulse(segment_base):
amp, freq,
phase_offset,
None, # no envelope
- self.name))
+ self.name,
+ coherent_pulsing=False))
return self.data_tmp
@loop_controller
diff --git a/pulse_lib/tests/utils/last_upload.py b/pulse_lib/tests/utils/last_upload.py
index 0cb41b0a..861b01b7 100644
--- a/pulse_lib/tests/utils/last_upload.py
+++ b/pulse_lib/tests/utils/last_upload.py
@@ -64,5 +64,5 @@ class LastUpload:
elif isinstance(e, PhaseShift):
print(f'shift phase {e.phase_shift:+6.3f} rad ({e.channel_name})')
elif isinstance(e, IQ_data_single):
- print(f'MW pulse {e.amplitude:6.2f} {e.frequency/1e6:6.1f} MHz {e.start_phase:+6.3f} rad ({e.ref_channel})')
+ print(f'MW pulse {e.amplitude:6.2f} {e.frequency/1e6:6.1f} MHz {e.phase_offset:+6.3f} rad ({e.ref_channel})')
--
GitLab