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

conditional and virtual phase experiment improvements #1066

Merged
merged 6 commits into from
Jan 24, 2025
Merged

conditional and virtual phase experiment improvements #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44d4171
get rid of parameters flux_pulse_amplitude and flux_pulse_duration
hay-k Jan 8, 2025
1e307e1
get rid of argument amplitude, and rename argument duration to flux_p…
hay-k Jan 8, 2025
361f059
unify fitting code, and normalize phase difference calculation
hay-k Jan 15, 2025
b989a23
adjust the heatmap range
hay-k Jan 15, 2025
18dd923
Update the vz signal experiment accordingly as well
hay-k Jan 15, 2025
2026610
update runcard in tests
hay-k Jan 15, 2025
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
44 changes: 13 additions & 31 deletions src/qibocal/protocols/two_qubit_interaction/optimize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
from qibolab.platform import Platform
from qibolab.qubits import QubitId, QubitPairId
from qibolab.sweeper import Parameter, Sweeper, SweeperType
from scipy.optimize import curve_fit

from qibocal import update
from qibocal.auto.operation import Data, Parameters, Results, Routine
from qibocal.config import log
from qibocal.protocols.utils import table_dict, table_html

from .utils import order_pair
from .virtual_z_phases import create_sequence, fit_function
from .virtual_z_phases import create_sequence, fit_sinusoid, phase_diff


@dataclass
Expand Down Expand Up @@ -164,9 +163,8 @@ def _acquisition(
for setup in ("I", "X"):
(
sequence,
flux_pulse,
theta_pulse,
amplitude,
data.durations[ord_pair],
) = create_sequence(
platform,
setup,
Expand All @@ -176,7 +174,7 @@ def _acquisition(
params.native,
params.dt,
params.parking,
params.flux_pulse_amplitude_min,
flux_pulse_max_duration=params.duration_max,
)
theta = np.arange(
params.theta_start,
Expand Down Expand Up @@ -211,15 +209,15 @@ def _acquisition(

sweeper_amplitude = Sweeper(
Parameter.amplitude,
amplitude_range / amplitude,
pulses=[sequence.qf_pulses[0]],
amplitude_range / flux_pulse.amplitude,
pulses=[flux_pulse],
type=SweeperType.FACTOR,
)

sweeper_duration = Sweeper(
Parameter.duration,
duration_range,
pulses=[sequence.qf_pulses[0]],
pulses=[flux_pulse],
type=SweeperType.ABSOLUTE,
)

Expand Down Expand Up @@ -280,28 +278,12 @@ def _fit(
)
)
]
pguess = [
np.max(target_data) - np.min(target_data),
np.mean(target_data),
np.pi,
]

try:
popt, _ = curve_fit(
fit_function,
np.array(data.thetas),
target_data,
p0=pguess,
bounds=(
(0, -np.max(target_data), 0),
(np.max(target_data), np.max(target_data), 2 * np.pi),
),
)

params = fit_sinusoid(np.array(data.thetas), target_data)
fitted_parameters[
target, control, setup, amplitude, duration
] = popt.tolist()

] = params
except Exception as e:
log.warning(
f"Fit failed for pair ({target, control}) due to {e}."
Expand All @@ -312,13 +294,13 @@ def _fit(
pair,
list(pair)[::-1],
):
angles[target_q, control_q, amplitude, duration] = abs(
angles[target_q, control_q, amplitude, duration] = phase_diff(
fitted_parameters[
target_q, control_q, "X", amplitude, duration
][2]
- fitted_parameters[
][2],
fitted_parameters[
target_q, control_q, "I", amplitude, duration
][2]
][2],
)
virtual_phases[ord_pair[0], ord_pair[1], amplitude, duration][
target_q
Expand Down Expand Up @@ -427,7 +409,7 @@ def _plot(
y=amps,
z=cz,
zmin=np.pi / 2,
zmax=3 * np.pi / 2,
zmax=np.pi,
name="{fit.native} angle",
colorbar_x=-0.1,
colorscale="RdBu",
Expand Down
119 changes: 43 additions & 76 deletions src/qibocal/protocols/two_qubit_interaction/virtual_z_phases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ class VirtualZPhasesParameters(Parameters):
iSWAP and CZ are the possible options.

"""
flux_pulse_amplitude: Optional[float] = None
"""Amplitude of flux pulse implementing CZ."""
flux_pulse_duration: Optional[float] = None
"""Duration of flux pulse implementing CZ."""
dt: Optional[float] = 20
"""Time delay between flux pulses and readout."""
parking: bool = True
Expand All @@ -62,10 +58,6 @@ class VirtualZPhasesResults(Results):
"""Virtual Z phase correction."""
leakage: dict[QubitPairId, dict[QubitId, float]]
"""Leakage on control qubit for pair."""
flux_pulse_amplitude: dict[QubitPairId, float]
"""Amplitude of flux pulse implementing CZ."""
flux_pulse_duration: dict[QubitPairId, int]
"""Duration of flux pulse implementing CZ."""

def __contains__(self, key: QubitPairId):
"""Check if key is in class.
Expand All @@ -88,8 +80,6 @@ class VirtualZPhasesData(Data):
data: dict[tuple, npt.NDArray[VirtualZPhasesType]] = field(default_factory=dict)
native: str = "CZ"
thetas: list = field(default_factory=list)
amplitudes: dict[tuple[QubitId, QubitId], float] = field(default_factory=dict)
durations: dict[tuple[QubitId, QubitId], float] = field(default_factory=dict)

def __getitem__(self, pair):
return {
Expand All @@ -108,14 +98,11 @@ def create_sequence(
native: str,
parking: bool,
dt: float,
amplitude: float = None,
duration: float = None,
flux_pulse_max_duration: float = None,
) -> tuple[
PulseSequence,
dict[QubitId, Pulse],
dict[QubitId, Pulse],
dict[QubitId, Pulse],
dict[QubitId, Pulse],
Pulse,
Pulse,
]:
"""Create the experiment PulseSequence."""

Expand All @@ -131,11 +118,10 @@ def create_sequence(
start=max(Y90_pulse.finish, RX_pulse_start.finish),
)

if amplitude is not None:
flux_sequence.get_qubit_pulses(ordered_pair[1])[0].amplitude = amplitude
flux_pulse = flux_sequence.get_qubit_pulses(ordered_pair[1])[0]
if flux_pulse_max_duration is not None:
flux_pulse.duration = flux_pulse_max_duration

if duration is not None:
flux_sequence.get_qubit_pulses(ordered_pair[1])[0].duration = duration
theta_pulse = platform.create_RX90_pulse(
target_qubit,
start=flux_sequence.finish + dt,
Expand Down Expand Up @@ -173,12 +159,8 @@ def create_sequence(
if pulse.qubit not in ordered_pair:
pulse.duration = theta_pulse.finish
sequence.add(pulse)
return (
sequence,
theta_pulse,
flux_sequence.get_qubit_pulses(ordered_pair[1])[0].amplitude,
flux_sequence.get_qubit_pulses(ordered_pair[1])[0].duration,
)

return sequence, flux_pulse, theta_pulse


def _acquisition(
Expand Down Expand Up @@ -216,9 +198,8 @@ def _acquisition(
for setup in ("I", "X"):
(
sequence,
_,
theta_pulse,
data.amplitudes[ord_pair],
data.durations[ord_pair],
) = create_sequence(
platform,
setup,
Expand All @@ -228,7 +209,6 @@ def _acquisition(
params.native,
params.dt,
params.parking,
params.flux_pulse_amplitude,
)
theta = np.arange(
params.theta_start,
Expand Down Expand Up @@ -267,12 +247,38 @@ def _acquisition(
return data


def fit_function(x, amplitude, offset, phase):
def sinusoid(x, amplitude, offset, phase):
"""Sinusoidal fit function."""
# return p0 + p1 * np.sin(2*np.pi*p2 * x + p3)
return np.sin(x + phase) * amplitude + offset


def phase_diff(phase_1, phase_2):
"""Return the phase difference of two sinusoids, normalized in the range [0, pi]."""
return np.arccos(np.cos(phase_1 - phase_2))


def fit_sinusoid(thetas, data):
"""Fit sinusoid to the given data."""
pguess = [
np.max(data) - np.min(data),
np.mean(data),
np.pi,
]

popt, _ = curve_fit(
sinusoid,
thetas,
data,
p0=pguess,
bounds=(
(0, -np.max(data), 0),
(np.max(data), np.max(data), 2 * np.pi),
),
)

return popt.tolist()


def _fit(
data: VirtualZPhasesData,
) -> VirtualZPhasesResults:
Expand All @@ -294,23 +300,9 @@ def _fit(
leakage[pair] = {}
for target, control, setup in data[pair]:
target_data = data[pair][target, control, setup].target
pguess = [
np.max(target_data) - np.min(target_data),
np.mean(target_data),
np.pi,
]
try:
popt, _ = curve_fit(
fit_function,
np.array(data.thetas),
target_data,
p0=pguess,
bounds=(
(0, -np.max(target_data), 0),
(np.max(target_data), np.max(target_data), 2 * np.pi),
),
)
fitted_parameters[target, control, setup] = popt.tolist()
params = fit_sinusoid(np.array(data.thetas), target_data)
fitted_parameters[target, control, setup] = params

except Exception as e:
log.warning(f"CZ fit failed for pair ({target, control}) due to {e}.")
Expand All @@ -320,9 +312,9 @@ def _fit(
pair,
list(pair)[::-1],
):
angle[target_q, control_q] = abs(
fitted_parameters[target_q, control_q, "X"][2]
- fitted_parameters[target_q, control_q, "I"][2]
angle[target_q, control_q] = phase_diff(
fitted_parameters[target_q, control_q, "X"][2],
fitted_parameters[target_q, control_q, "I"][2],
)
virtual_phase[pair][target_q] = -fitted_parameters[
target_q, control_q, "I"
Expand All @@ -342,16 +334,13 @@ def _fit(
pass # exception covered above
return VirtualZPhasesResults(
native=data.native,
flux_pulse_amplitude=data.amplitudes,
flux_pulse_duration=data.durations,
angle=angle,
virtual_phase=virtual_phase,
fitted_parameters=fitted_parameters,
leakage=leakage,
)


# TODO: remove str
def _plot(data: VirtualZPhasesData, fit: VirtualZPhasesResults, target: QubitPairId):
"""Plot routine for VirtualZPhases."""
pair_data = data[target]
Expand Down Expand Up @@ -406,7 +395,7 @@ def _plot(data: VirtualZPhasesData, fit: VirtualZPhasesResults, target: QubitPai
fig.add_trace(
go.Scatter(
x=angle_range,
y=fit_function(
y=sinusoid(
angle_range,
*fitted_parameters,
),
Expand Down Expand Up @@ -436,21 +425,6 @@ def _plot(data: VirtualZPhasesData, fit: VirtualZPhasesResults, target: QubitPai
)
)
)
fitting_report.add(
table_html(
table_dict(
[qubits[1], qubits[1]],
[
"Flux pulse amplitude [a.u.]",
"Flux pulse duration [ns]",
],
[
np.round(data.amplitudes[qubits], 4),
np.round(data.durations[qubits], 4),
],
)
)
)

fig1.update_layout(
title_text=f"Phase correction Qubit {qubits[0]}",
Expand All @@ -473,17 +447,10 @@ def _plot(data: VirtualZPhasesData, fit: VirtualZPhasesResults, target: QubitPai

def _update(results: VirtualZPhasesResults, platform: Platform, target: QubitPairId):
# FIXME: quick fix for qubit order
qubit_pair = tuple(sorted(target))
target = tuple(sorted(target))
update.virtual_phases(
results.virtual_phase[target], results.native, platform, target
)
getattr(update, f"{results.native}_duration")(
results.flux_pulse_duration[target], platform, target
)
getattr(update, f"{results.native}_amplitude")(
results.flux_pulse_amplitude[target], platform, target
)


correct_virtual_z_phases = Routine(
Expand Down
4 changes: 1 addition & 3 deletions src/qibocal/protocols/two_qubit_interaction/virtual_z_phases_signal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,8 @@ def _acquisition(
for setup in ("I", "X"):
(
sequence,
_,
theta_pulse,
data.amplitudes[ord_pair],
data.durations[ord_pair],
) = create_sequence(
platform,
setup,
Expand All @@ -87,7 +86,6 @@ def _acquisition(
params.native,
params.dt,
params.parking,
params.flux_pulse_amplitude,
)
theta = np.arange(
params.theta_start,
Expand Down
Loading
Loading