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.

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
84 changes: 55 additions & 29 deletions src/qibolab/instruments/zhinst.py
Original file line number Diff line number Diff line change
Expand Up @@ -872,32 +872,53 @@ 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
if len(self.sequence[f"couplerflux{c}"]) != 0:
GabrielePalazzo marked this conversation as resolved.
Show resolved Hide resolved
play_after = None
for j, sequence in enumerate(self.sub_sequences[f"couplerflux{c}"]):
with exp.section(
uid=f"sequence_couplerflux{c}_{j}", play_after=play_after
):
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
play_after = f"sequence_couplerflux{c}_{j}"
GabrielePalazzo marked this conversation as resolved.
Show resolved Hide resolved

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
Expand All @@ -906,7 +927,7 @@ def flux(self, exp, qubits):
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
uid=f"sequence_flux{q}_{j}", play_after=play_after
):
for pulse in sequence:
if not isinstance(pulse, ZhSweeperLine):
Expand All @@ -926,10 +947,15 @@ def flux(self, exp, qubits):
elif isinstance(pulse, ZhPulse):
exp.play(signal=f"flux{q}", pulse=pulse.zhpulse)
i += 1
play_after = f"sequence_bias{q}_{j}"
play_after = f"sequence_flux{q}_{j}"

def drive(self, exp, qubits):
"""Qubit driving pulses."""
def drive(self, exp: lo.Experiment, qubits: Dict[str, Qubit]):
"""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
Expand Down Expand Up @@ -1047,7 +1073,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