Skip to content

Commit

Permalink
refactor: merge main and improve plots
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrea-pasquale
andrea-pasquale committed Jan 24, 2024
2 parents 2ddacbe + de8cf42 commit fa86200
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 101 deletions.
87 changes: 34 additions & 53 deletions ...qibocal/protocols/characterization/readout_optimization/twpa_calibration/frequency_SNR.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,6 @@ def load(cls, path):
obj.power_level = PowerLevel(obj.power_level) # pylint: disable=E1101
return obj

def register_qubit(self, qubit, freq, twpa_freq, signal, phase):
"""Store output for single qubit."""
size = len(freq)
ar = np.empty(size, dtype=ResonatorTWPAFrequencyType)
ar["freq"] = freq
ar["twpa_freq"] = np.array([twpa_freq] * size)
ar["signal"] = signal
ar["phase"] = phase
if qubit in self.data:
self.data[qubit] = np.rec.array(np.concatenate((self.data[qubit], ar)))
else:
self.data[qubit] = np.rec.array(ar)


def _acquisition(
params: ResonatorTWPAFrequencyParameters,
Expand Down Expand Up @@ -157,11 +144,14 @@ def _acquisition(

for qubit in qubits:
data.register_qubit(
qubit,
signal=resonator_spectroscopy_data[qubit].signal,
phase=resonator_spectroscopy_data[qubit].phase,
freq=resonator_spectroscopy_data[qubit].freq,
twpa_freq=_freq + initial_twpa_freq[qubit],
ResonatorTWPAFrequencyType,
(qubit),
dict(
signal=resonator_spectroscopy_data[qubit].signal,
phase=resonator_spectroscopy_data[qubit].phase,
freq=resonator_spectroscopy_data[qubit].freq,
twpa_freq=_freq + initial_twpa_freq[qubit],
),
)

return data
Expand All @@ -176,19 +166,14 @@ def _fit(data: ResonatorTWPAFrequencyData) -> ResonatorTWPAFrequencyResults:
for qubit in qubits:
data_qubit = data[qubit]
if data.resonator_type == "3D":
print("3D")
index_best_freq = np.argmax(data_qubit["signal"])
twpa_frequency[qubit] = data_qubit["twpa_freq"][index_best_freq]
else:
print("2D")
index_best_freq = np.argmin(data_qubit["signal"])
twpa_frequency[qubit] = data_qubit["twpa_freq"][index_best_freq]
twpa_frequency[qubit] = data_qubit["twpa_freq"][index_best_freq]

if data.power_level is PowerLevel.high:
print("high")
bare_frequency[qubit] = data_qubit["freq"][index_best_freq]
else:
print("low")
frequency[qubit] = data_qubit["freq"][index_best_freq]

if data.power_level is PowerLevel.high:
Expand All @@ -214,15 +199,15 @@ def _plot(data: ResonatorTWPAFrequencyData, fit: ResonatorTWPAFrequencyResults,
horizontal_spacing=0.1,
vertical_spacing=0.2,
subplot_titles=(
"signal",
"phase [rad]",
"Signal [a.u.]",
"Phase [rad]",
),
)

fitting_report = ""
qubit_data = data[qubit]
resonator_frequencies = qubit_data.freq * HZ_TO_GHZ
twpa_frequencies = qubit_data.twpa_freq
twpa_frequencies = qubit_data.twpa_freq * HZ_TO_GHZ

fig.add_trace(
go.Heatmap(
Expand All @@ -234,8 +219,8 @@ def _plot(data: ResonatorTWPAFrequencyData, fit: ResonatorTWPAFrequencyResults,
row=1,
col=1,
)
fig.update_xaxes(title_text=f"{qubit}: Frequency [Hz]", row=1, col=1)
fig.update_yaxes(title_text="TWPA Frequency", row=1, col=1)
fig.update_xaxes(title_text="Frequency [GHz]", row=1, col=1)
fig.update_yaxes(title_text="TWPA Frequency [GHz]", row=1, col=1)
fig.add_trace(
go.Heatmap(
x=resonator_frequencies,
Expand All @@ -246,34 +231,30 @@ def _plot(data: ResonatorTWPAFrequencyData, fit: ResonatorTWPAFrequencyResults,
row=1,
col=2,
)
fig.update_xaxes(title_text=f"{qubit}: Frequency [Hz]", row=1, col=2)
fig.update_yaxes(title_text="TWPA Frequency", row=1, col=2)
fig.update_xaxes(title_text="Frequency [GHz]", row=1, col=2)
fig.update_yaxes(title_text="TWPA Frequency [GHz]", row=1, col=2)

if fit is not None:
label_1 = "TWPA Frequency [Hz]"
twpa_frequency = np.round(fit.twpa_frequency[qubit])
if qubit in fit.bare_frequency:
summary = table_dict(
qubit,
[
"High Power Resonator Frequency [Hz]",
"TWPA Frequency [Hz]",
],
[
np.round(fit.bare_frequency[qubit]),
np.round(fit.twpa_frequency[qubit]),
],
)
label_2 = "High Power Resonator Frequency [Hz]"
resonator_frequency = np.round(fit.bare_frequency[qubit])
else:
summary = table_dict(
qubit,
[
"Low Power Resonator Frequency [Hz]",
"TWPA Frequency [Hz]",
],
[
np.round(fit.frequency[qubit]),
np.round(fit.twpa_frequency[qubit]),
],
)
label_2 = "Low Power Resonator Frequency [Hz]"
resonator_frequency = np.round(fit.frequency[qubit])

summary = table_dict(
qubit,
[
label_2,
label_1,
],
[
resonator_frequency,
twpa_frequency,
],
)

fitting_report = table_html(summary)

Expand Down
81 changes: 33 additions & 48 deletions src/qibocal/protocols/characterization/readout_optimization/twpa_calibration/power_SNR.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,6 @@ def load(cls, path):
obj.power_level = PowerLevel(obj.power_level) # pylint: disable=E1101
return obj

def register_qubit(self, qubit, freq, twpa_pow, signal, phase):
"""Store output for single qubit."""
size = len(freq)
ar = np.empty(size, dtype=ResonatorTWPAPowerType)
ar["freq"] = freq
ar["twpa_pow"] = np.array([twpa_pow] * size)
ar["signal"] = signal
ar["phase"] = phase
if qubit in self.data:
self.data[qubit] = np.rec.array(np.concatenate((self.data[qubit], ar)))
else:
self.data[qubit] = np.rec.array(ar)


def _acquisition(
params: ResonatorTWPAPowerParameters,
Expand Down Expand Up @@ -155,11 +142,14 @@ def _acquisition(

for qubit in qubits:
data.register_qubit(
qubit,
signal=resonator_spectroscopy_data.data[qubit].signal,
phase=resonator_spectroscopy_data.data[qubit].phase,
freq=resonator_spectroscopy_data.data[qubit].freq,
twpa_pow=_pow + initial_twpa_pow[qubit],
ResonatorTWPAPowerType,
(qubit),
dict(
signal=resonator_spectroscopy_data.data[qubit].signal,
phase=resonator_spectroscopy_data.data[qubit].phase,
freq=resonator_spectroscopy_data.data[qubit].freq,
twpa_pow=_pow + initial_twpa_pow[qubit],
),
)

return data
Expand All @@ -175,10 +165,9 @@ def _fit(data: ResonatorTWPAPowerData, fit_type="att") -> ResonatorTWPAPowerResu
data_qubit = data[qubit]
if data.resonator_type == "3D":
index_best_pow = np.argmax(data_qubit["signal"])
twpa_power[qubit] = data_qubit["twpa_pow"][index_best_pow]
else:
index_best_pow = np.argmin(data_qubit["signal"])
twpa_power[qubit] = data_qubit["twpa_pow"][index_best_pow]
twpa_power[qubit] = data_qubit["twpa_pow"][index_best_pow]

if data.power_level is PowerLevel.high:
bare_frequency[qubit] = data_qubit["freq"][index_best_pow]
Expand Down Expand Up @@ -208,8 +197,8 @@ def _plot(data: ResonatorTWPAPowerData, fit: ResonatorTWPAPowerResults, qubit):
horizontal_spacing=0.1,
vertical_spacing=0.2,
subplot_titles=(
"signal",
"phase [rad]",
"Signal [a.u.]",
"Phase [rad]",
),
)

Expand All @@ -228,8 +217,8 @@ def _plot(data: ResonatorTWPAPowerData, fit: ResonatorTWPAPowerResults, qubit):
row=1,
col=1,
)
fig.update_xaxes(title_text=f"{qubit}: Frequency [Hz]", row=1, col=1)
fig.update_yaxes(title_text="TWPA Power", row=1, col=1)
fig.update_xaxes(title_text="Frequency [GHz]", row=1, col=1)
fig.update_yaxes(title_text="TWPA Power [dBm]", row=1, col=1)
fig.add_trace(
go.Heatmap(
x=frequencies,
Expand All @@ -240,34 +229,30 @@ def _plot(data: ResonatorTWPAPowerData, fit: ResonatorTWPAPowerResults, qubit):
row=1,
col=2,
)
fig.update_xaxes(title_text=f"{qubit}: Frequency [Hz]", row=1, col=2)
fig.update_yaxes(title_text="TWPA Power", row=1, col=2)
fig.update_xaxes(title_text="Frequency [GHz]", row=1, col=2)
fig.update_yaxes(title_text="TWPA Power [dBm]", row=1, col=2)

if fit is not None:
label_1 = "TWPA Power"
twpa_power = np.round(fit.twpa_power[qubit])
if qubit in fit.bare_frequency:
summary = table_dict(
qubit,
[
"High Power Resonator Frequency [Hz]",
"TWPA Power",
],
[
np.round(fit.bare_frequency[qubit]),
np.round(fit.twpa_power[qubit]),
],
)
label_2 = "High Power Resonator Frequency [Hz]"
resonator_frequency = np.round(fit.bare_frequency[qubit])
else:
summary = table_dict(
qubit,
[
"Low Power Resonator Frequency [Hz]",
"TWPA Power",
],
[
np.round(fit.frequency[qubit]),
np.round(fit.twpa_power[qubit]),
],
)
label_2 = "Low Power Resonator Frequency [Hz]"
resonator_frequency = np.round(fit.frequency[qubit])

summary = table_dict(
qubit,
[
label_2,
label_1,
],
[
resonator_frequency,
twpa_power,
],
)

fitting_report = table_html(summary)

Expand Down

0 comments on commit fa86200

Please sign in to comment.