qilimanjaro-tech · fedonman · Oct 30, 2024 · Oct 15, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -20,7 +20,6 @@ coverage:
         target: 100% # make sure coverage of new lines is 100%
         flags:
           - "unittests"
-
   notify:
     slack:
       default:
@@ -33,3 +32,8 @@ coverage:
           - "unittests"
         paths:
           - "src"
+
+ignore:
+  - "src/qililab/instruments/keithley/keithley_2600.py"
+  - "src/qililab/instruments/qblox/qblox_d5a.py"
+  - "src/qililab/instruments/qblox/qblox_s4g.py"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
     rev: "v1.11.2"
     hooks:
       - id: mypy
-        args: [--no-strict-optional, --ignore-missing-imports]
+        args: ["--no-strict-optional", "--ignore-missing-imports", "--config-file=pyproject.toml"]
         additional_dependencies: []
 
   - repo: https://github.com/executablebooks/mdformat

diff --git a/tests/chip/__init__.py → calibration_db.json b/tests/chip/__init__.py → calibration_db.json
diff --git a/docs/code/chip.rst b/docs/code/chip.rst
diff --git a/docs/code/drivers.rst b/docs/code/drivers.rst
diff --git a/docs/code/transpiler.rst b/docs/code/transpiler.rst
@@ -1,4 +1,4 @@
 ql.transpiler
 ===============
 
-.. automodule:: qililab.circuit_transpiler
+.. automodule:: qililab.digital
diff --git a/docs/fundamentals/platform.rst b/docs/fundamentals/platform.rst
@@ -7,8 +7,6 @@ The platform represents the laboratory setup used to control the quantum devices
 
 The :class:`.Platform` object is the responsible for managing the initializations, connections, setups, and executions of the laboratory, which mainly consists of:
 
-- :class:`.Chip`
-
 - Buses
 
 - Instruments

diff --git a/docs/fundamentals/runcard.rst b/docs/fundamentals/runcard.rst
@@ -9,8 +9,6 @@ They contain all the laboratory information, settings and parameters, concretely
 
 - Gates transpilation
 
-- :class:`.Chip`
-
 - Instruments
 
 - Buses
@@ -206,7 +204,6 @@ Runcard YAML file example:
             alias: QRM1
             firmware: 0.7.0
             num_sequencers: 2
-            acquisition_delay_time: 100
             out_offsets: [0, 0]
             awg_sequencers:
                 -   identifier: 0

diff --git a/docs/index.rst b/docs/index.rst
@@ -82,8 +82,6 @@ Qililab Documentation
 
    code/ql
    code/calibration
-   code/chip
-   code/drivers
    code/platform
    code/pulse
    code/qprogram

diff --git a/docs/releases/changelog-dev.md b/docs/releases/changelog-dev.md
@@ -165,6 +165,23 @@
 - Renamed the platform's `execute_anneal_program()` method to `execute_annealing_program()` and updated its parameters. The method now expects `preparation_block` and `measurement_block`, which are strings used to retrieve blocks from the `Calibration`. These blocks are inserted before and after the annealing schedule, respectively.
   [#816](https://github.com/qilimanjaro-tech/qililab/pull/816)
 
+- **Major reorganization of the library structure and runcard functionality**. Key updates include:
+
+  - Removed obsolete instruments, such as VNAs.
+  - Removed the `drivers` module.
+  - Simplified the `Qblox` sequencer class hierarchy into two main classes: `QbloxSequencer` and `QbloxADCSequencer`.
+  - Removed `SystemController` and `ReadoutSystemController`; buses now interface directly with instruments.
+  - Introduced a new `channels` attribute to the `Bus` class, allowing specification of channels for each associated instrument.
+  - Removed the `Chip` class and its related runcard settings.
+  - Eliminated outdated settings, such as instrument firmware.
+  - Refactored runcard settings into a modular structure with four distinct groups:
+    - `instruments` and `instrument_controllers` for lab instrument setup.
+    - `buses` for grouping instrument channels.
+    - `digital` for digital compilation settings (e.g., Qibo circuits).
+    - `analog` for analog compilation settings (e.g., annealing programs).
+
+[#820](https://github.com/qilimanjaro-tech/qililab/pull/820)
+
 ### Deprecations / Removals
 
 ### Documentation

diff --git a/examples/runcards/galadriel.yml b/examples/runcards/galadriel.yml
@@ -410,7 +410,6 @@ instruments:
     alias: QRM1
     firmware: 0.7.0
     num_sequencers: 5
-    acquisition_delay_time: 100
     out_offsets: [0, 0]
     awg_sequencers:
       - identifier: 0

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,6 +2,7 @@
 line-length = 120
 output-format = "concise"
 target-version = "py310"
+extend-exclude = ["test_*.py", "data.py"]
 
 [tool.ruff.lint]
 preview = true
@@ -76,6 +77,7 @@ ignore = [
 dummy-variable-rgx = "^_$"
 logger-objects = ["qililab.logger"]
 
+
 [tool.ruff.lint.per-file-ignores]
 "tests/*" = ["ANN", "S", "CPY", "SLF001", "PLR", "DOC", "RUF012"]
 "docs/*" = ["CPY"]
@@ -101,7 +103,7 @@ warn_return_any = false
 ignore_missing_imports = true
 exclude = [
     "\\.ipynb$",
-    "tests/*"
+    "^tests/.*"
 ]
 
 [tool.commitizen]
@@ -140,7 +142,11 @@ tag_format = "$version"
         "*/virtualenv/*",
         "*/virtualenvs/*",
         "*/tests/*",
-        "examples/*"
+        "examples/*",
+        # TODO: Remove these once we modernize instruments
+        "src/qililab/instruments/keithley/keithley_2600.py",
+        "src/qililab/instruments/qblox/qblox_d5a.py",
+        "src/qililab/instruments/qblox/qblox_s4g.py"
     ]
 
 [tool.nbqa.md]

diff --git a/src/qililab/__init__.py b/src/qililab/__init__.py
@@ -22,14 +22,13 @@
 from .data_management import build_platform, load_results, save_platform, save_results
 from .execute_circuit import execute
 from .qprogram import Calibration, CrosstalkMatrix, Domain, QbloxCompiler, QProgram, QuantumMachinesCompiler, Experiment
-from .result import ExperimentResults, Results, stream_results
+from .result import ExperimentResults, stream_results
 from .typings import Parameter
-from .utils import Loop
 from .utils.serialization import serialize, serialize_to, deserialize, deserialize_from
 from .waveforms import IQPair, Square, Gaussian, FlatTop, Arbitrary, DragCorrection, Waveform, Ramp, Chained
 
 # moving circuit_transpiler module imports here because it has instruments module dependencies so circular imports can be avoided
-from .circuit_transpiler import Drag, Wait
+from .digital import Drag, Wait
 from .analog import AnnealingProgram  # same as circuit transpiler, top modules should be imported at top
 
 
@@ -47,13 +46,11 @@
     "FlatTop",
     "Gaussian",
     "IQPair",
-    "Loop",
     "Parameter",
     "QProgram",
     "QbloxCompiler",
     "QuantumMachinesCompiler",
     "Ramp",
-    "Results",
     "Square",
     "Wait",
     "Waveform",

diff --git a/src/qililab/analog/annealing_program.py b/src/qililab/analog/annealing_program.py
@@ -17,7 +17,7 @@
 import numpy as np
 
 from qililab.qprogram import CrosstalkMatrix, FluxVector
-from qililab.settings.runcard import Runcard
+from qililab.settings.analog import FluxControlTopology
 from qililab.waveforms import Arbitrary
 
 
@@ -44,7 +44,7 @@ class AnnealingProgram:
 
     def __init__(
         self,
-        flux_to_bus_topology: list[Runcard.FluxControlTopology],
+        flux_to_bus_topology: list[FluxControlTopology],
         annealing_program: list[dict[str, dict[str, float]]],
     ):
         """Init method"""

diff --git a/src/qililab/chip/__init__.py b/src/qililab/chip/__init__.py