From 85983232e32d261b6ed22efc1cef2766468247ed Mon Sep 17 00:00:00 2001 From: knzwnao Date: Tue, 8 Feb 2022 01:49:37 +0900 Subject: [PATCH 1/2] update fit function --- qiskit_experiments/curve_analysis/fit_function.py | 4 ++-- .../curve_analysis/standard_analysis/resonance.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qiskit_experiments/curve_analysis/fit_function.py b/qiskit_experiments/curve_analysis/fit_function.py index 280399496f..776509ef6d 100644 --- a/qiskit_experiments/curve_analysis/fit_function.py +++ b/qiskit_experiments/curve_analysis/fit_function.py @@ -83,9 +83,9 @@ def sqrt_lorentzian( r"""Square-root Lorentzian function for spectroscopy. .. math:: - y = {\rm amp}{\rm abs}\left(\frac{1}{1 + 2i(x - x0)/\kappa}\right) + {\rm baseline} + y = \frac{{\rm amp} \kappa}{\sqrt{\kappa^2 + 4(x -x_0)^2}} + {\rm baseline} """ - return amp * np.abs(1 / (1 + 2.0j * (x - x0) / kappa)) + baseline + return amp * kappa / np.sqrt(kappa**2 + 4 * (x - x0) ** 2) + baseline def cos_decay( diff --git a/qiskit_experiments/curve_analysis/standard_analysis/resonance.py b/qiskit_experiments/curve_analysis/standard_analysis/resonance.py index e6997657b0..bc524372fd 100644 --- a/qiskit_experiments/curve_analysis/standard_analysis/resonance.py +++ b/qiskit_experiments/curve_analysis/standard_analysis/resonance.py @@ -64,7 +64,7 @@ class ResonanceAnalysis(curve.CurveAnalysis): x, amp=a, kappa=kappa, x0=freq, baseline=b ), plot_color="blue", - model_description=r"a abs(1 / (1 + 2i * (x - x_0) / \kappa)) + b", + model_description=r"a \kappa / sqrt(kappa^2 + 4 * (x - x_0)^2) + b", ) ] From d1a7ca2385c16844cf7956d719ffa9fd6d576ef3 Mon Sep 17 00:00:00 2001 From: knzwnao Date: Tue, 8 Feb 2022 05:25:16 +0900 Subject: [PATCH 2/2] add abs --- qiskit_experiments/curve_analysis/fit_function.py | 4 ++-- .../curve_analysis/standard_analysis/resonance.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qiskit_experiments/curve_analysis/fit_function.py b/qiskit_experiments/curve_analysis/fit_function.py index 776509ef6d..d7bcd17df6 100644 --- a/qiskit_experiments/curve_analysis/fit_function.py +++ b/qiskit_experiments/curve_analysis/fit_function.py @@ -83,9 +83,9 @@ def sqrt_lorentzian( r"""Square-root Lorentzian function for spectroscopy. .. math:: - y = \frac{{\rm amp} \kappa}{\sqrt{\kappa^2 + 4(x -x_0)^2}} + {\rm baseline} + y = \frac{{\rm amp} |\kappa|}{\sqrt{\kappa^2 + 4(x -x_0)^2}} + {\rm baseline} """ - return amp * kappa / np.sqrt(kappa**2 + 4 * (x - x0) ** 2) + baseline + return amp * abs(kappa) / np.sqrt(kappa**2 + 4 * (x - x0) ** 2) + baseline def cos_decay( diff --git a/qiskit_experiments/curve_analysis/standard_analysis/resonance.py b/qiskit_experiments/curve_analysis/standard_analysis/resonance.py index bc524372fd..f7783e880d 100644 --- a/qiskit_experiments/curve_analysis/standard_analysis/resonance.py +++ b/qiskit_experiments/curve_analysis/standard_analysis/resonance.py @@ -64,7 +64,7 @@ class ResonanceAnalysis(curve.CurveAnalysis): x, amp=a, kappa=kappa, x0=freq, baseline=b ), plot_color="blue", - model_description=r"a \kappa / sqrt(kappa^2 + 4 * (x - x_0)^2) + b", + model_description=r"a |\kappa| / sqrt(kappa^2 + 4 * (x - x_0)^2) + b", ) ]