Merge branch 'master' into job_manager

Qiskit · Dec 11, 2019 · 97a723e · 97a723e
2 parents ca3e817 + dbe3e2b
commit 97a723e
Show file tree

Hide file tree

Showing 5 changed files with 1,307 additions and 1,214 deletions.
diff --git a/qiskit/1_start_here.ipynb b/qiskit/1_start_here.ipynb
@@ -73,7 +73,9 @@
     "##  4 Qiskit Ignis\n",
     "\n",
     "Ignis, the ‘fire’ element, is dedicated to fighting noise and errors and to forging a new path. This includes better characterization of errors, improving gates, and computing in the presence of noise. Ignis is meant for those who want to design quantum error correction codes, or who wish to study ways to characterize errors through methods such as tomography and randomized benchmarking, or even to find a better way for using gates by exploring dynamical decoupling and optimal control. Ignis tutorials are found [here](advanced/ignis/) and include:\n",
-    "  1. [Calibrating a qubit](advanced/ignis/1_calibrating_a_qubit.ipynb) - Using pulse to calibrate a \"pi-pulse\" gate by fitting a Rabi oscillation on a qubit. Using the \"pi-pulse\" measure the single-shot analog voltages that are returned by an experiment.\n",
+    "  1. Calibrating a qubit:\n",
+    "    * a. [Calibrating a qubit](advanced/ignis/1a_calibrating_a_qubit.ipynb) - Using pulse to calibrate a \"pi-pulse\" gate by fitting a Rabi oscillation on a qubit. Using the \"pi-pulse\" measure the single-shot analog voltages that are returned by an experiment.\n",
+    "    * b. [Calibrating a two-qubit gate](advanced/ignis/1b_calibrating_a_two_qubit_gate.ipynb - \n",
     "  2. [Hamiltonian and gate characterizations](advanced/ignis/2_hamiltonian_and_gate_characterization.ipynb) - Sequences to measure ZZ rates between qubits and to measure rotation and angle errors in the gates.\n",
     "  3. [Relaxation and decoherence](advanced/ignis/3_relaxation_and_decoherence.ipynb) - How to measure coherence times on the real quantum hardware\n",
     "  4. [Measurement error mitigation](advanced/ignis/4_measurement_error_mitigation.ipynb) - How to peform calibration experiments for measurement errors and fed those calibrations into a \"filter\" that can be utilized to mitigate errors in subsequent experiments.\n",

diff --git a/qiskit/advanced/ignis/1_calibrating_a_qubit.ipynb b/qiskit/advanced/ignis/1_calibrating_a_qubit.ipynb
diff --git a/qiskit/advanced/ignis/1a_calibrating_a_qubit.ipynb b/qiskit/advanced/ignis/1a_calibrating_a_qubit.ipynb
diff --git a/qiskit/advanced/ignis/1b_calibrating_a_two_qubit_gate.ipynb b/qiskit/advanced/ignis/1b_calibrating_a_two_qubit_gate.ipynb