Commit 4ff97292 authored by Kelvin Loh's avatar Kelvin Loh 🖖
Browse files

Merge branch 'rename-control-stack' into 'develop' 

Refactored ControlStack name to InstrumentCoordinator

See merge request quantify-os/quantify-scheduler!151
parents 1b08b922 2b229a76

CHANGELOG.rst

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ Merged branches and closed issues 
* Feature: Added zhinst backend option to enable Calibration mode, Closes #103. (!123)

* Added acquisitions to circuit diagram (!93)

* Added Chirp and Staircase pulses; and efficient implementation in Qblox backend (!106)

* Added ControlStack (!70)

* Feature: Added Controlstack property is_running, Closes #113 (!140)

* Feature: Added Controlstack wait_done method, Closes #113 (!140)

* Added Qblox ControlStack components (!112)

* Added InstrumentCoordinator (!70)

* Feature: Added InstrumentCoordinator property is_running, Closes #113 (!140)

* Feature: Added InstrumentCoordinator wait_done method, Closes #113 (!140)

* Added Qblox InstrumentCoordinator components (!112)

* Renamed input parameters of quantify_scheduler.schedules.* functions. (!136)

docs/api_reference.rst

+6 −6
Original line number Diff line number Diff line
@@ -206,30 +206,30 @@ pulse_diagram 
.. automodule:: quantify_scheduler.visualization.pulse_diagram

    :members:



controlstack

-------------

instrument_coordinator

----------------------



.. automodule:: quantify_scheduler.controlstack

.. automodule:: quantify_scheduler.instrument_coordinator

    :members:



base

~~~~



.. automodule:: quantify_scheduler.controlstack.components.base

.. automodule:: quantify_scheduler.instrument_coordinator.components.base

    :members:

    :show-inheritance:



qblox

~~~~~



.. automodule:: quantify_scheduler.controlstack.components.qblox

.. automodule:: quantify_scheduler.instrument_coordinator.components.qblox

    :members:

    :show-inheritance:



zhinst

~~~~~~



.. automodule:: quantify_scheduler.controlstack.components.zhinst

.. automodule:: quantify_scheduler.instrument_coordinator.components.zhinst

    :members:

    :show-inheritance:

quantify_scheduler/acquisition_library.py

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ class WeightedIntegratedComplex(Operation): 
        """

        if phase != 0:

            # Because of how clock interfaces were changed.

            # FIXME: need to be able to add phases to the waveform separate from the clock.

            raise NotImplementedError("Non-zero phase not yet implemented")



        if data is None:

quantify_scheduler/backends/qblox/instrument_compilers.py

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class LocalOscillator(InstrumentCompiler): 


    def compile(self, repetitions: int = 1) -> Optional[Dict[str, Any]]:

        """

        Compiles the program for the LO control stack component.

        Compiles the program for the LO InstrumentCoordinator component.



        Parameters

        ----------
@@ -99,8 +99,8 @@ class LocalOscillator(InstrumentCompiler): 
        Returns

        -------

        :

            Dictionary containing all the information the ControlStack component needs

            to set the parameters appropriately.

            Dictionary containing all the information the InstrumentCoordinator

            component needs to set the parameters appropriately.

        """

        if self.frequency is None:

            return None

quantify_scheduler/backends/types/qblox.py

+7 −6
Original line number Diff line number Diff line
@@ -120,14 +120,14 @@ class LOSettings(DataClassJsonMixin): 
@dataclass

class PulsarSettings(DataClassJsonMixin):

    """

    Global settings for the pulsar to be set in the control stack component. This is

    kept separate from the settings that can be set on a per sequencer basis, which are

    specified in `SequencerSettings`.

    Global settings for the pulsar to be set in the InstrumentCoordinator component.

    This is kept separate from the settings that can be set on a per sequencer basis,

    which are specified in `SequencerSettings`.

    """



    ref: str

    """The reference source. Should either be "internal" or "external", will raise an

    exception in the cs component otherwise."""

    exception in the instrument coordinator component otherwise."""

    hardware_averages: int = 1

    """The number of repetitions of the Schedule."""

    acq_mode: str = "SSBIntegrationComplex"
@@ -151,7 +151,7 @@ class PulsarSettings(DataClassJsonMixin): 
@dataclass

class SequencerSettings(DataClassJsonMixin):

    """

    Sequencer level settings. In the drivers these settings are typically recognised by

    Sequencer level settings. In the drivers these settings are typically recognized by

    parameter names of the form "sequencer_{index}_{setting}". These settings are set

    once at the start and will remain unchanged after. Meaning that these correspond to

    the "slow" QCoDeS parameters and not settings that are changed dynamically by the
@@ -171,7 +171,8 @@ class SequencerSettings(DataClassJsonMixin): 
    when using IQ mixers."""

    duration: int = 0

    """Duration of the acquisition. This is a temporary addition for not yet merged the

    ControlStack to function properly. This will be removed in a later version!"""

    InstrumentCoordinator to function properly. This will be removed in a later

    version!"""





@dataclass