Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Splitting coupler_flux sequence into multiple sub sections #723

Merged
merged 10 commits into from
Jan 16, 2024
Merged

Splitting coupler_flux sequence into multiple sub sections #723

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bd8f7f5
Renamed bias->flux in sequences
GabrielePalazzo Dec 20, 2023
2b6dd8b
Splitting couplerflux into multiple sub_sequences
GabrielePalazzo Dec 20, 2023
9e698ef
Improved docstrings
GabrielePalazzo Dec 20, 2023
759df21
Fixed limit on the sequence name
GabrielePalazzo Dec 20, 2023
46a83bc
Update src/qibolab/instruments/zhinst.py
GabrielePalazzo Jan 11, 2024
91df8bb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 11, 2024
abff321
Removed check on sequence length
GabrielePalazzo Jan 11, 2024
573c347
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 11, 2024
9c4e15f
Update src/qibolab/instruments/zhinst.py
GabrielePalazzo Jan 12, 2024
545a865
Applied Hayk's suggestion for drive and flux
GabrielePalazzo Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
191 changes: 102 additions & 89 deletions src/qibolab/instruments/zhinst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,109 +872,122 @@ def play_sweep(self, exp, qubit, pulse, section):
exp, qubit, pulse, section, parameters, partial_sweep
)

def couplerflux(self, exp, couplers):
"""Coupler flux for bias sweep or pulses."""
def couplerflux(self, exp: lo.Experiment, couplers: Dict[str, Coupler]):
"""Coupler flux for bias sweep or pulses.

Args:
exp (lo.Experiment): laboneq experiment on which register sequences.
couplers (dict[str, Coupler]): coupler on which pulses are played.
"""
for coupler in couplers.values():
c = coupler.name # pylint: disable=C0103
with exp.section(uid=f"sequence_bias_coupler{c}"):
i = 0
time = 0
for pulse in self.sequence[f"couplerflux{c}"]:
pulse.zhpulse.uid += str(i)
exp.delay(
signal=f"couplerflux{c}",
time=round(pulse.pulse.start * NANO_TO_SECONDS, 9) - time,
)
time = round(pulse.pulse.duration * NANO_TO_SECONDS, 9) + round(
pulse.pulse.start * NANO_TO_SECONDS, 9
)
if isinstance(pulse, ZhSweeperLine):
self.play_sweep(exp, coupler, pulse, section="couplerflux")
elif isinstance(pulse, ZhSweeper):
self.play_sweep(exp, coupler, pulse, section="couplerflux")
elif isinstance(pulse, ZhPulse):
exp.play(signal=f"couplerflux{c}", pulse=pulse.zhpulse)
i += 1

def flux(self, exp, qubits):
"""Qubit flux for bias sweep or pulses."""
time = 0
i = 0
previous_section = None
for j, sequence in enumerate(self.sub_sequences[f"couplerflux{c}"]):
section_uid = f"sequence_couplerflux{c}_{j}"
with exp.section(uid=section_uid, play_after=previous_section):
for pulse in sequence:
pulse.zhpulse.uid += str(i)
exp.delay(
signal=f"couplerflux{c}",
time=round(pulse.pulse.start * NANO_TO_SECONDS, 9) - time,
)
time = round(pulse.pulse.duration * NANO_TO_SECONDS, 9) + round(
pulse.pulse.start * NANO_TO_SECONDS, 9
)
if isinstance(pulse, ZhSweeperLine):
self.play_sweep(exp, coupler, pulse, section="couplerflux")
elif isinstance(pulse, ZhSweeper):
self.play_sweep(exp, coupler, pulse, section="couplerflux")
elif isinstance(pulse, ZhPulse):
exp.play(signal=f"couplerflux{c}", pulse=pulse.zhpulse)
i += 1
GabrielePalazzo marked this conversation as resolved.
Show resolved Hide resolved
previous_section = section_uid

def flux(self, exp: lo.Experiment, qubits: Dict[str, Qubit]):
"""Qubit flux for bias sweep or pulses.

Args:
exp (lo.Experiment): laboneq experiment on which register sequences.
qubits (dict[str, Qubit]): qubits on which pulses are played.
"""
for qubit in qubits.values():
q = qubit.name # pylint: disable=C0103
time = 0
i = 0
if len(self.sequence[f"flux{q}"]) != 0:
play_after = None
for j, sequence in enumerate(self.sub_sequences[f"flux{q}"]):
with exp.section(
uid=f"sequence_bias{q}_{j}", play_after=play_after
):
for pulse in sequence:
if not isinstance(pulse, ZhSweeperLine):
pulse.zhpulse.uid += str(i)
exp.delay(
signal=f"flux{q}",
time=round(pulse.pulse.start * NANO_TO_SECONDS, 9)
- time,
)
time = round(
pulse.pulse.duration * NANO_TO_SECONDS, 9
) + round(pulse.pulse.start * NANO_TO_SECONDS, 9)
if isinstance(pulse, ZhSweeperLine):
self.play_sweep(exp, qubit, pulse, section="flux")
elif isinstance(pulse, ZhSweeper):
self.play_sweep(exp, qubit, pulse, section="flux")
elif isinstance(pulse, ZhPulse):
exp.play(signal=f"flux{q}", pulse=pulse.zhpulse)
i += 1
play_after = f"sequence_bias{q}_{j}"
play_after = None
for j, sequence in enumerate(self.sub_sequences[f"flux{q}"]):
with exp.section(uid=f"sequence_flux{q}_{j}", play_after=play_after):
for pulse in sequence:
if not isinstance(pulse, ZhSweeperLine):
pulse.zhpulse.uid += str(i)
exp.delay(
signal=f"flux{q}",
time=round(pulse.pulse.start * NANO_TO_SECONDS, 9)
- time,
)
time = round(
pulse.pulse.duration * NANO_TO_SECONDS, 9
) + round(pulse.pulse.start * NANO_TO_SECONDS, 9)
if isinstance(pulse, ZhSweeperLine):
self.play_sweep(exp, qubit, pulse, section="flux")
elif isinstance(pulse, ZhSweeper):
self.play_sweep(exp, qubit, pulse, section="flux")
elif isinstance(pulse, ZhPulse):
exp.play(signal=f"flux{q}", pulse=pulse.zhpulse)
i += 1
play_after = f"sequence_flux{q}_{j}"

def drive(self, exp: lo.Experiment, qubits: Dict[str, Qubit]):
"""Qubit driving pulses.

def drive(self, exp, qubits):
"""Qubit driving pulses."""
Args:
exp (lo.Experiment): laboneq experiment on which register sequences.
qubits (dict[str, Qubit]): qubits on which pulses are played.
"""
for qubit in qubits.values():
q = qubit.name # pylint: disable=C0103
time = 0
i = 0
if len(self.sequence[f"drive{q}"]) != 0:
play_after = None
for j, sequence in enumerate(self.sub_sequences[f"drive{q}"]):
with exp.section(
uid=f"sequence_drive{q}_{j}", play_after=play_after
):
for pulse in sequence:
if not isinstance(pulse, ZhSweeperLine):
exp.delay(
signal=f"drive{q}",
time=round(pulse.pulse.start * NANO_TO_SECONDS, 9)
- time,
)
time = round(
pulse.pulse.duration * NANO_TO_SECONDS, 9
) + round(pulse.pulse.start * NANO_TO_SECONDS, 9)
pulse.zhpulse.uid += str(i)
if isinstance(pulse, ZhSweeper):
self.play_sweep(exp, qubit, pulse, section="drive")
elif isinstance(pulse, ZhPulse):
exp.play(
signal=f"drive{q}",
pulse=pulse.zhpulse,
phase=pulse.pulse.relative_phase,
)
i += 1
elif isinstance(pulse, ZhSweeperLine):
exp.delay(signal=f"drive{q}", time=pulse.zhsweeper)

if len(self.sequence[f"readout{q}"]) > 0 and isinstance(
self.sequence[f"readout{q}"][0], ZhSweeperLine
):
play_after = None
for j, sequence in enumerate(self.sub_sequences[f"drive{q}"]):
with exp.section(uid=f"sequence_drive{q}_{j}", play_after=play_after):
for pulse in sequence:
if not isinstance(pulse, ZhSweeperLine):
exp.delay(
signal=f"drive{q}",
time=self.sequence[f"readout{q}"][0].zhsweeper,
)
self.sequence[f"readout{q}"].remove(
self.sequence[f"readout{q}"][0]
time=round(pulse.pulse.start * NANO_TO_SECONDS, 9)
- time,
)
time = round(
pulse.pulse.duration * NANO_TO_SECONDS, 9
) + round(pulse.pulse.start * NANO_TO_SECONDS, 9)
pulse.zhpulse.uid += str(i)
if isinstance(pulse, ZhSweeper):
self.play_sweep(exp, qubit, pulse, section="drive")
elif isinstance(pulse, ZhPulse):
exp.play(
signal=f"drive{q}",
pulse=pulse.zhpulse,
phase=pulse.pulse.relative_phase,
)
i += 1
elif isinstance(pulse, ZhSweeperLine):
exp.delay(signal=f"drive{q}", time=pulse.zhsweeper)

if len(self.sequence[f"readout{q}"]) > 0 and isinstance(
self.sequence[f"readout{q}"][0], ZhSweeperLine
):
exp.delay(
signal=f"drive{q}",
time=self.sequence[f"readout{q}"][0].zhsweeper,
)
self.sequence[f"readout{q}"].remove(
self.sequence[f"readout{q}"][0]
)

play_after = f"sequence_drive{q}_{j}"
play_after = f"sequence_drive{q}_{j}"

def find_subsequence_finish(
self,
Expand Down Expand Up @@ -1047,7 +1060,7 @@ def measure_relax(self, exp, qubits, couplers, relaxation_time, acquisition_type
qf_finish,
cf_finish,
],
dtype=[("finish", "i4"), ("line", "U10")],
dtype=[("finish", "i4"), ("line", "U15")],
hay-k marked this conversation as resolved.
Show resolved Hide resolved
)
latest_sequence = finish_times[finish_times["finish"].argmax()]
if latest_sequence["line"] == "None":
Expand Down