-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Update T1 experiment #6487
Update T1 experiment #6487
Changes from 9 commits
633cfa6
8008823
b8264b9
07fcfac
e73d8df
c8041cc
3c6591e
5bbc32d
d795b39
f19c740
ea4e8b9
a6fdb92
3c107ec
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,7 +77,12 @@ def t1_decay( | |
|
||
var = sympy.Symbol('delay_ns') | ||
|
||
sweep = study.Linspace(var, start=min_delay_nanos, stop=max_delay_nanos, length=num_points) | ||
if min_delay_nanos == 0: | ||
min_delay_nanos = 0.4 | ||
sweep_vals_ns = np.unique( | ||
np.logspace(np.log10(min_delay_nanos), np.log10(max_delay_nanos), num_points, dtype=int) | ||
) | ||
sweep = study.Points(var, sweep_vals_ns) | ||
|
||
circuit = circuits.Circuit( | ||
ops.X(qubit), ops.wait(qubit, nanos=var), ops.measure(qubit, key='output') | ||
|
@@ -118,8 +123,8 @@ def data(self) -> pd.DataFrame: | |
def constant(self) -> float: | ||
"""The t1 decay constant.""" | ||
|
||
def exp_decay(x, t1): | ||
return np.exp(-x / t1) | ||
def exp_decay(x, t1, a, b): | ||
return a * np.exp(-x / t1) + b | ||
|
||
xs = self._data['delay_ns'] | ||
ts = self._data['true_count'] | ||
|
@@ -132,7 +137,8 @@ def exp_decay(x, t1): | |
|
||
# Fit to exponential decay to find the t1 constant | ||
try: | ||
popt, _ = optimize.curve_fit(exp_decay, xs, probs, p0=[t1_guess]) | ||
popt, _ = optimize.curve_fit(exp_decay, xs, probs, p0=[t1_guess, 1.0, 0.0]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: you can assign directly self.popt, _ = optimize.curve_fit(exp_decay, xs, probs, p0=[t1_guess, 1.0, 0.0]) |
||
self.popt = popt | ||
t1 = popt[0] | ||
return t1 | ||
except RuntimeError: | ||
|
@@ -166,7 +172,9 @@ def plot( | |
ax.plot(xs, ts / (fs + ts), 'ro-', **plot_kwargs) | ||
|
||
if include_fit and not np.isnan(self.constant): | ||
ax.plot(xs, np.exp(-xs / self.constant), label='curve fit') | ||
t1 = self.constant | ||
t1, a, b = self.popt | ||
ax.plot(xs, a * np.exp(-xs / t1) + b, label='curve fit') | ||
plt.legend() | ||
|
||
ax.set_xlabel(r"Delay between initialization and measurement (nanoseconds)") | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ def test_init_result(): | |
data = pd.DataFrame( | ||
columns=['delay_ns', 'false_count', 'true_count'], | ||
index=range(2), | ||
data=[[100.0, 0, 10], [1000.0, 10, 0]], | ||
data=[[100, 0, 10], [1000, 10, 0]], | ||
) | ||
result = cirq.experiments.T1DecayResult(data) | ||
assert result.data is data | ||
|
@@ -53,15 +53,15 @@ def noisy_moment(self, moment, system_qubits): | |
repetitions=10, | ||
max_delay=cirq.Duration(nanos=500), | ||
) | ||
results.plot() | ||
results.plot(include_fit=True) | ||
|
||
|
||
def test_result_eq(): | ||
eq = cirq.testing.EqualsTester() | ||
eq.make_equality_group( | ||
lambda: cirq.experiments.T1DecayResult( | ||
data=pd.DataFrame( | ||
columns=['delay_ns', 'false_count', 'true_count'], index=[0], data=[[100.0, 2, 8]] | ||
columns=['delay_ns', 'false_count', 'true_count'], index=[0], data=[[100, 2, 8]] | ||
) | ||
) | ||
) | ||
|
@@ -103,7 +103,7 @@ def noisy_moment(self, moment, system_qubits): | |
data=pd.DataFrame( | ||
columns=['delay_ns', 'false_count', 'true_count'], | ||
index=range(4), | ||
data=[[100.0, 0, 10], [400.0, 0, 10], [700.0, 10, 0], [1000.0, 10, 0]], | ||
data=[[100, 0, 10], [215, 0, 10], [464, 0, 10], [1000, 10, 0]], | ||
) | ||
) | ||
|
||
|
@@ -121,7 +121,7 @@ def test_all_on_results(): | |
data=pd.DataFrame( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you change this line to
so that we get a more informative error message. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I tried this, and it just outputs
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I suspect it may have something to do with data types since I changed line 83 in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. looks like it's indeed a types issue specifically for the >>> results.data.dtypes
delay_ns float64
false_count int64
true_count int64
dtype: object
>>> desired.data.dtypes
delay_ns int64
false_count int64
true_count int64
dtype: object There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's pretty strange. When I run it on linux, There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the result is computed by Why do you want to force There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I changed it back to |
||
columns=['delay_ns', 'false_count', 'true_count'], | ||
index=range(4), | ||
data=[[100.0, 0, 10], [400.0, 0, 10], [700.0, 0, 10], [1000.0, 0, 10]], | ||
data=[[100, 0, 10], [215, 0, 10], [464, 0, 10], [1000, 0, 10]], | ||
) | ||
) | ||
|
||
|
@@ -139,7 +139,7 @@ def test_all_off_results(): | |
data=pd.DataFrame( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above |
||
columns=['delay_ns', 'false_count', 'true_count'], | ||
index=range(4), | ||
data=[[100.0, 10, 0], [400.0, 10, 0], [700.0, 10, 0], [1000.0, 10, 0]], | ||
data=[[100, 10, 0], [215, 10, 0], [464, 10, 0], [1000, 10, 0]], | ||
) | ||
) | ||
|
||
|
@@ -150,27 +150,13 @@ def test_curve_fit_plot_works(): | |
data=pd.DataFrame( | ||
columns=['delay_ns', 'false_count', 'true_count'], | ||
index=range(4), | ||
data=[[100.0, 6, 4], [400.0, 10, 0], [700.0, 10, 0], [1000.0, 10, 0]], | ||
data=[[100, 6, 4], [215, 10, 0], [464, 10, 0], [1000, 10, 0]], | ||
) | ||
) | ||
|
||
good_fit.plot(include_fit=True) | ||
|
||
|
||
@pytest.mark.usefixtures('closefigures') | ||
def test_curve_fit_plot_warning(): | ||
bad_fit = cirq.experiments.T1DecayResult( | ||
data=pd.DataFrame( | ||
columns=['delay_ns', 'false_count', 'true_count'], | ||
index=range(4), | ||
data=[[100.0, 10, 0], [400.0, 10, 0], [700.0, 10, 0], [1000.0, 10, 0]], | ||
) | ||
) | ||
|
||
with pytest.warns(RuntimeWarning, match='Optimal parameters could not be found for curve fit'): | ||
bad_fit.plot(include_fit=True) | ||
|
||
|
||
@pytest.mark.parametrize('t1', [200, 500, 700]) | ||
def test_noise_model_continous(t1): | ||
class GradualDecay(cirq.NoiseModel): | ||
|
@@ -196,10 +182,10 @@ def noisy_moment(self, moment, system_qubits): | |
results = cirq.experiments.t1_decay( | ||
sampler=cirq.DensityMatrixSimulator(noise=GradualDecay(t1)), | ||
qubit=cirq.GridQubit(0, 0), | ||
num_points=4, | ||
num_points=10, | ||
repetitions=10, | ||
min_delay=cirq.Duration(nanos=100), | ||
max_delay=cirq.Duration(micros=1), | ||
min_delay=cirq.Duration(nanos=1), | ||
max_delay=cirq.Duration(micros=10), | ||
) | ||
|
||
assert np.isclose(results.constant, t1, 50) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use the original parameter to make it clear that this happens when no
min_delay
is suppliedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to keep it as is in case the user specifies 0 min delay.