T2 experiment with Hahn echoes

docs/_ext/autodoc_analysis.py

@@ -26,14 +26,12 @@ class AnalysisDocumenter(ClassDocumenter):
     """Sphinx extension for the custom documentation of the standard analysis class."""
 
     objtype = "analysis"
-    directivetype = 'class'
+    directivetype = "class"
     priority = 10 + ClassDocumenter.priority
     option_spec = dict(ClassDocumenter.option_spec)
 
     @classmethod
-    def can_document_member(
-        cls, member: Any, membername: str, isattr: bool, parent: Any
-    ) -> bool:
+    def can_document_member(cls, member: Any, membername: str, isattr: bool, parent: Any) -> bool:
         return isinstance(member, BaseAnalysis)
 
     def add_content(self, more_content: Any, no_docstring: bool = False) -> None:

docs/_ext/custom_styles/utils.py

@@ -161,7 +161,7 @@ def _generate_analysis_ref(
         raise Exception(f"Option docstring for analysis_ref is missing.")
 
     analysis_ref_lines = []
-    for line in lines[analysis_ref_start + 1:]:
+    for line in lines[analysis_ref_start + 1 :]:
         # add lines until hitting to next section
         if line.startswith("# section:"):
             break
@@ -202,6 +202,7 @@ def _format_default_options(defaults: Dict[str, Any], indent: str = "") -> List[
 
 def _check_no_indent(method: Callable) -> Callable:
     """Check indent of lines and return if this block is correctly indented."""
+
     def wraps(self, lines: List[str], *args, **kwargs):
         if all(l.startswith(" ") for l in lines):
             text_block = "\n".join(lines)

docs/conf.py

@@ -25,35 +25,39 @@
 #
 import os
 import sys
-sys.path.insert(0, os.path.abspath('.'))
+
+sys.path.insert(0, os.path.abspath("."))
 sys.path.append(os.path.abspath("./_ext"))
 
 """
 Sphinx documentation builder
 """
 
 import os
+
 # Set env flag so that we can doc functions that may otherwise not be loaded
 # see for example interactive visualizations in qiskit.visualization.
-os.environ['QISKIT_DOCS'] = 'TRUE'
+os.environ["QISKIT_DOCS"] = "TRUE"
 
 # -- Project information -----------------------------------------------------
-project = 'Qiskit Experiments'
-copyright = '2021, Qiskit Development Team'  # pylint: disable=redefined-builtin
-author = 'Qiskit Development Team'
+project = "Qiskit Experiments"
+copyright = "2021, Qiskit Development Team"  # pylint: disable=redefined-builtin
+author = "Qiskit Development Team"
 
 # The short X.Y version
-version = '0.3'
+version = "0.3"
 # The full version, including alpha/beta/rc tags
-release = '0.3.0'
+release = "0.3.0"
 
 rst_prolog = """
 .. raw:: html
 
     <br><br><br>
 
 .. |version| replace:: {0}
-""".format(release)
+""".format(
+    release
+)
 
 nbsphinx_prolog = """
 {% set docname = env.doc2path(env.docname, base=None) %}
@@ -81,32 +85,31 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.napoleon',
-    'sphinx.ext.autodoc',
-    'sphinx.ext.autosummary',
-    'sphinx.ext.mathjax',
-    'sphinx.ext.viewcode',
-    'sphinx.ext.extlinks',
-    'jupyter_sphinx',
-    'sphinx_autodoc_typehints',
-    'reno.sphinxext',
-    'sphinx_panels',
-    'sphinx.ext.intersphinx',
-    'nbsphinx',
-    'autoref',
-    'autodoc_experiment',
-    'autodoc_analysis',
+    "sphinx.ext.napoleon",
+    "sphinx.ext.autodoc",
+    "sphinx.ext.autosummary",
+    "sphinx.ext.mathjax",
+    "sphinx.ext.viewcode",
+    "sphinx.ext.extlinks",
+    "jupyter_sphinx",
+    "sphinx_autodoc_typehints",
+    "reno.sphinxext",
+    "sphinx_panels",
+    "sphinx.ext.intersphinx",
+    "nbsphinx",
+    "autoref",
+    "autodoc_experiment",
+    "autodoc_analysis",
 ]
-html_static_path = ['_static']
-templates_path = ['_templates']
-html_css_files = ['style.css', 'custom.css', 'gallery.css']
+html_static_path = ["_static"]
+templates_path = ["_templates"]
+html_css_files = ["style.css", "custom.css", "gallery.css"]
 
 nbsphinx_timeout = 360
-nbsphinx_execute = os.getenv('QISKIT_DOCS_BUILD_TUTORIALS', 'never')
-nbsphinx_widgets_path = ''
-exclude_patterns = ['_build', '**.ipynb_checkpoints']
-nbsphinx_thumbnails = {
-}
+nbsphinx_execute = os.getenv("QISKIT_DOCS_BUILD_TUTORIALS", "never")
+nbsphinx_widgets_path = ""
+exclude_patterns = ["_build", "**.ipynb_checkpoints"]
+nbsphinx_thumbnails = {}
 
 
 # -----------------------------------------------------------------------------
@@ -120,7 +123,7 @@
 # -----------------------------------------------------------------------------
 
 autodoc_default_options = {
-    'inherited-members': None,
+    "inherited-members": None,
 }
 
 
@@ -131,9 +134,7 @@
 # A dictionary mapping 'figure', 'table', 'code-block' and 'section' to
 # strings that are used for format of figure numbers. As a special character,
 # %s will be replaced to figure number.
-numfig_format = {
-    'table': 'Table %s'
-}
+numfig_format = {"table": "Table %s"}
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
@@ -144,10 +145,10 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', '**.ipynb_checkpoints']
+exclude_patterns = ["_build", "**.ipynb_checkpoints"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'colorful'
+pygments_style = "colorful"
 
 # A boolean that decides whether module names are prepended to all object names
 # (for object types where a “module” of some kind is defined), e.g. for
@@ -158,7 +159,7 @@
 # (e.g., if this is set to ['foo.'], then foo.bar is shown under B, not F).
 # This can be handy if you document a project that consists of a single
 # package. Works only for the HTML builder currently.
-modindex_common_prefix = ['qiskit_experiments.']
+modindex_common_prefix = ["qiskit_experiments."]
 
 # -- Configuration for extlinks extension ------------------------------------
 # Refer to https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html
@@ -169,20 +170,20 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'qiskit_sphinx_theme'  # use the theme in subdir 'theme'
+html_theme = "qiskit_sphinx_theme"  # use the theme in subdir 'theme'
 
-#html_sidebars = {'**': ['globaltoc.html']}
-html_last_updated_fmt = '%Y/%m/%d'
+# html_sidebars = {'**': ['globaltoc.html']}
+html_last_updated_fmt = "%Y/%m/%d"
 
 html_theme_options = {
-    'logo_only': True,
-    'display_version': True,
-    'prev_next_buttons_location': 'bottom',
-    'style_external_links': True,
+    "logo_only": True,
+    "display_version": True,
+    "prev_next_buttons_location": "bottom",
+    "style_external_links": True,
 }
 
-autoclass_content = 'both'
-intersphinx_mapping = {'matplotlib': ('https://matplotlib.org/stable/', None)}
+autoclass_content = "both"
+intersphinx_mapping = {"matplotlib": ("https://matplotlib.org/stable/", None)}
 # Current scipy hosted docs are missing the object.inv file so leaving this
 # commented out until the missing file is added back.
 #                       'scipy': ('https://docs.scipy.org/doc/scipy/reference/', None)}

qiskit_experiments/curve_analysis/curve_fit.py

@@ -140,7 +140,7 @@ def fit_func(x, *params):
     yfits = fit_func(xdata, *popt)
     residues = (yfits - ydata) ** 2
     if sigma is not None:
-        residues = residues / (sigma ** 2)
+        residues = residues / (sigma**2)
     reduced_chisq = np.sum(residues) / dof
 
     # Compute data range for fit

qiskit_experiments/curve_analysis/data_processing.py

@@ -151,7 +151,7 @@ def mean_xy_data(
 
             # Compute sample mean and sum of variance with weights based on shots
             y_means[i] = np.sum(weights * ys)
-            y_sigmas[i] = np.sqrt(np.sum(weights ** 2 * ss ** 2))
+            y_sigmas[i] = np.sqrt(np.sum(weights**2 * ss**2))
             y_shots[i] = np.sum(ns)
 
         return x_means, y_means, y_sigmas, y_shots

qiskit_experiments/curve_analysis/fit_function.py

@@ -74,7 +74,7 @@ def gaussian(
     .. math::
         y = {\rm amp} \cdot \exp \left( - (x - x0)^2 / 2 \sigma^2 \right) + {\rm baseline}
     """
-    return amp * np.exp(-((x - x0) ** 2) / (2 * sigma ** 2)) + baseline
+    return amp * np.exp(-((x - x0) ** 2) / (2 * sigma**2)) + baseline
 
 
 def cos_decay(
@@ -123,9 +123,9 @@ def bloch_oscillation_x(
     where :math:`\omega = \sqrt{p_x^2 + p_y^2 + p_z^2}`. The `p_i` stands for the
     measured probability in :math:`i \in \left\{ X, Y, Z \right\}` basis.
     """
-    w = np.sqrt(px ** 2 + py ** 2 + pz ** 2)
+    w = np.sqrt(px**2 + py**2 + pz**2)
 
-    return (-pz * px + pz * px * np.cos(w * x) + w * py * np.sin(w * x)) / (w ** 2) + baseline
+    return (-pz * px + pz * px * np.cos(w * x) + w * py * np.sin(w * x)) / (w**2) + baseline
 
 
 def bloch_oscillation_y(
@@ -140,9 +140,9 @@ def bloch_oscillation_y(
     where :math:`\omega = \sqrt{p_x^2 + p_y^2 + p_z^2}`. The `p_i` stands for the
     measured probability in :math:`i \in \left\{ X, Y, Z \right\}` basis.
     """
-    w = np.sqrt(px ** 2 + py ** 2 + pz ** 2)
+    w = np.sqrt(px**2 + py**2 + pz**2)
 
-    return (pz * py - pz * py * np.cos(w * x) - w * px * np.sin(w * x)) / (w ** 2) + baseline
+    return (pz * py - pz * py * np.cos(w * x) - w * px * np.sin(w * x)) / (w**2) + baseline
 
 
 def bloch_oscillation_z(
@@ -157,6 +157,6 @@ def bloch_oscillation_z(
     where :math:`\omega = \sqrt{p_x^2 + p_y^2 + p_z^2}`. The `p_i` stands for the
     measured probability in :math:`i \in \left\{ X, Y, Z \right\}` basis.
     """
-    w = np.sqrt(px ** 2 + py ** 2 + pz ** 2)
+    w = np.sqrt(px**2 + py**2 + pz**2)
 
-    return (pz ** 2 + (px ** 2 + py ** 2) * np.cos(w * x)) / (w ** 2) + baseline
+    return (pz**2 + (px**2 + py**2) * np.cos(w * x)) / (w**2) + baseline

qiskit_experiments/database_service/db_analysis_result.py

@@ -169,7 +169,7 @@ def save(self) -> None:
             if db_value is not None:
                 result_data["value"] = db_value
             if isinstance(value.stderr, (int, float)):
-                result_data["variance"] = self._display_format(value.stderr ** 2)
+                result_data["variance"] = self._display_format(value.stderr**2)
             if isinstance(value.unit, str):
                 result_data["unit"] = value.unit
         else:

qiskit_experiments/library/calibration/fine_drag_cal.py

@@ -138,7 +138,7 @@ def update_calibrations(self, experiment_data: ExperimentData):
         d_theta = BaseUpdater.get_value(experiment_data, "d_theta", result_index)
 
         # See the documentation in fine_drag.py for the derivation of this rule.
-        d_beta = -np.sqrt(np.pi) * d_theta * sigmas[0] / target_angle ** 2
+        d_beta = -np.sqrt(np.pi) * d_theta * sigmas[0] / target_angle**2
         old_beta = experiment_data.metadata["cal_param_value"]
         new_beta = old_beta + d_beta
 

qiskit_experiments/library/characterization/__init__.py

@@ -25,6 +25,7 @@
 
     T1
     T2Ramsey
+    T2Hahn
     QubitSpectroscopy
     CrossResonanceHamiltonian
     EchoedCrossResonanceHamiltonian
@@ -52,6 +53,7 @@
 
     T1Analysis
     T2RamseyAnalysis
+    T2HahnAnalysis
     CrossResonanceHamiltonianAnalysis
     DragCalAnalysis
     FineHalfAngleAnalysis
@@ -69,6 +71,7 @@
     RamseyXYAnalysis,
     T2RamseyAnalysis,
     T1Analysis,
+    T2HahnAnalysis,
     CrossResonanceHamiltonianAnalysis,
     ReadoutAngleAnalysis,
 )
@@ -77,6 +80,7 @@
 from .qubit_spectroscopy import QubitSpectroscopy
 from .ef_spectroscopy import EFSpectroscopy
 from .t2ramsey import T2Ramsey
+from .t2hahn import T2Hahn
 from .cr_hamiltonian import CrossResonanceHamiltonian, EchoedCrossResonanceHamiltonian
 from .rabi import Rabi, EFRabi
 from .half_angle import HalfAngle

qiskit_experiments/library/characterization/analysis/__init__.py

@@ -19,6 +19,7 @@
 from .fine_frequency_analysis import FineFrequencyAnalysis
 from .ramsey_xy_analysis import RamseyXYAnalysis
 from .t2ramsey_analysis import T2RamseyAnalysis
+from .t2hahn_analysis import T2HahnAnalysis
 from .t1_analysis import T1Analysis
 from .cr_hamiltonian_analysis import CrossResonanceHamiltonianAnalysis
 from .readout_angle_analysis import ReadoutAngleAnalysis

qiskit_experiments/library/characterization/analysis/cr_hamiltonian_analysis.py

@@ -336,7 +336,7 @@ def _extra_database_entry(self, fit_data: curve.FitData) -> List[AnalysisResultD
                 else:
                     coef_val = 0.5 * (p0_val.value + p1_val.value) / (2 * np.pi)
 
-                coef_err = 0.5 * np.sqrt(p0_val.stderr ** 2 + p1_val.stderr ** 2) / (2 * np.pi)
+                coef_err = 0.5 * np.sqrt(p0_val.stderr**2 + p1_val.stderr**2) / (2 * np.pi)
 
                 extra_entries.append(
                     AnalysisResultData(