Commit c3cf835a authored by Robert Sokolewicz's avatar Robert Sokolewicz
Browse files

Merge branch 'time-circuit-diagram' into 'main'

Make box separation in circuit_diagram_matplotlib always equal to one (QAE-869, QAE-870)

Closes #61 and #126

See merge request !589
parents 89662d4d dc34c20d
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
- Tests - Removed unused `lo0` and added `ttl_acq_threshold` in `qblox_test_mapping_nv_centers.json` so that `TestNVDarkESRSched` suite passes (!579)
- Documentation - Removed deprecated code from the Compiling to Hardware Tutorial (!582)
- Qblox backend - Typecast attenuations to `int`s before assigning them (!570)
- Visualization - Make box separation in circuit_diagram_matplotlib always equal to one (!589)
- Qblox backend - Remove `mix_lo` from `SequencerSettings` (!896)

## 0.10.1 (2022-12-20)
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ from quantify_scheduler.structure import DataStructure

logger = logging.getLogger(__name__)


# pylint: disable=too-few-public-methods
class LatencyCorrections(DataStructure):
    """
+1 −3
Original line number Diff line number Diff line
@@ -12,9 +12,7 @@ import numpy as np

from quantify_scheduler.enums import BinMode

from quantify_scheduler.backends.qblox.operation_handling.base import (
    IOperationStrategy,
)
from quantify_scheduler.backends.qblox.operation_handling.base import IOperationStrategy
from quantify_scheduler.backends.types import qblox as types
from quantify_scheduler.backends.qblox.qasm_program import QASMProgram
from quantify_scheduler.backends.qblox import helpers, constants, q1asm_instructions
+2 −2
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ class SeqcILGenerator(object):
        program: str = ""
        program += "// Generated by quantify-scheduler.\n"
        program += "// Variables\n"
        for (name, operation) in self._variables.values():
        for name, operation in self._variables.values():
            if operation is not None:
                program += f"{name} = {operation}\n"
            else:
@@ -494,7 +494,7 @@ class SeqcILGenerator(object):
        program += "\n// Operations\n"
        current_level = 0
        previous_level = 0
        for (level, operation) in self._program:
        for level, operation in self._program:
            current_level = level
            if current_level > previous_level:
                # indent
+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ class ZISettings:
        for setting in self._daq_settings:
            settings_dict = {**settings_dict, **setting.as_dict()}

        for (awg_index, setting) in self._awg_settings.items():
        for awg_index, setting in self._awg_settings.items():
            # need to explicitly initialize an empty dict as different awgs can set a
            # setting related to the same node and we do not want to overwrite the key.
            if setting.node not in settings_dict:
@@ -123,7 +123,7 @@ class ZISettings:

    def apply(self, instrument: base.ZIBaseInstrument) -> None:
        """Apply all settings to the instrument."""
        for (_, setting) in self._awg_settings.items():
        for _, setting in self._awg_settings.items():
            setting.apply(instrument)

        def sort_by_fn(setting: ZISetting):
@@ -213,7 +213,7 @@ class ZISettings:

            collection = {**collection, **setting.as_dict()}

        for (awg_index, setting) in _tmp_awg_list.items():
        for awg_index, setting in _tmp_awg_list.items():
            if setting.node == "compiler/sourcestring":
                if "compiler/sourcestring" not in collection:
                    collection["compiler/sourcestring"] = dict()
@@ -387,7 +387,7 @@ class ZISettingsBuilder:
        -------
        :
        """
        for (node, value) in defaults:
        for node, value in defaults:
            self._set_daq(ZISetting(node, value, zi_helpers.set_value))
        return self

Loading