Merge branch 'main' into simplify_builder

qiboteam · May 11, 2023 · 1cdd8dd · 1cdd8dd
2 parents cc265c8 + 4e329b3
commit 1cdd8dd
Show file tree

Hide file tree

Showing 17 changed files with 1,224 additions and 39 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,6 +20,6 @@ repos:
       - id: isort
         args: ["--profile", "black"]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
diff --git a/extras/classification/play.py b/extras/classification/play.py
@@ -5,15 +5,15 @@
 
 logging.basicConfig(level=logging.INFO)
 data_path = Path("calibrate_qubit_states/data.csv")
-base_dir = Path("_results3")
+base_dir = Path("results")
 base_dir.mkdir(exist_ok=True)
 
 for qubit in range(1, 5):
     print(f"QUBIT: {qubit}")
     qubit_dir = base_dir / f"qubit{qubit}"
     table, y_test, x_test = run.train_qubit(
-        data_path, base_dir, qubit, classifiers=["qubit_fit"]
+        data_path, base_dir, qubit, classifiers=["qblox_fit"]
     )
     run.dump_benchmarks_table(table, qubit_dir)
+
     plots.plot_table(table, qubit_dir)
-    plots.plot_conf_matr(y_test, qubit_dir)
diff --git a/poetry.lock b/poetry.lock
diff --git a/src/qibocal/calibrations/__init__.py b/src/qibocal/calibrations/__init__.py
@@ -8,5 +8,6 @@
 from qibocal.calibrations.characterization.ramsey import *
 from qibocal.calibrations.characterization.resonator_spectroscopy import *
 from qibocal.calibrations.characterization.resonator_spectroscopy_sample import *
+from qibocal.calibrations.characterization.ro_optimization import *
 from qibocal.calibrations.characterization.spin_echo import *
 from qibocal.calibrations.characterization.t1 import *