Commit cbb4c8ef authored by Edgar Reehuis's avatar Edgar Reehuis
Browse files

Merge branch 'nv-xfail-spec-trigger-count' into 'main' 

xfail compilation test for spectroscopy schedule

See merge request !571
parents f8f1150e 5c6f2d6a

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
- Qblox ICCs - Replace `"acq_mapping"` by `"trace_acq_channel"` in the compiled schedule (!515)



### Merged branches and closed issues

- NV centers - Test for spectroscopy schedule temporarily disabled (!571).

- Acquisition - Data obtained with TriggerCount acquisition is formatted correctly (!530).

- Acquisition - Follow-up for !530: Fix wrong assumption in input format (!564).

- NV centers - Dark ESR schedule combining all prior operations (!527)

quantify_scheduler/schemas/examples/qblox_test_mapping_nv_centers.json

+18 −5
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
        "cluster0_module2": {

            "instrument_type": "QCM",

            "real_output_0": {

                "lo_name": "lo0",

                "lo_name": "lo_spinpump_laser",

                "mix_lo": false,

                "portclock_configs": [

                    {

                        "port": "qe0:optical_control",
@@ -34,7 +35,8 @@ 
                ]

            },

            "real_output_1": {

                "lo_name": "lo0",

                "lo_name": "lo_green_laser",

                "mix_lo": false,

                "portclock_configs": [

                    {

                        "port": "qe0:optical_control",
@@ -45,7 +47,8 @@ 
                ]

            },

            "real_output_2": {

                "lo_name": "lo0",

                "lo_name": "lo_readout_laser",

                "mix_lo": false,

                "portclock_configs": [

                    {

                        "port": "qe0:optical_control",
@@ -70,7 +73,17 @@ 
            }

        }

    },

    "lo0": {

    "lo_readout_laser": {

        "instrument_type": "LocalOscillator",

        "frequency": null,

        "power": 1

    },

    "lo_spinpump_laser": {

        "instrument_type": "LocalOscillator",

        "frequency": null,

        "power": 1

    },

    "lo_green_laser": {

        "instrument_type": "LocalOscillator",

        "frequency": null,

        "power": 1

tests/scheduler/schedules/test_spectroscopy_schedules.py

+11 −3
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# pylint: disable=missing-class-docstring

# pylint: disable=missing-function-docstring



import pytest



from quantify_scheduler.backends import SerialCompiler

from quantify_scheduler.compilation import (

    determine_absolute_timing,
@@ -159,11 +161,17 @@ class TestNVDarkESRSched: 
        device_config = mock_setup_basic_nv["quantum_device"].generate_device_config()

        qcompile(self.uncomp_sched, device_config)



    def test_compiles_qblox_backend(self, mock_setup_basic_nv) -> None:

    @pytest.mark.xfail(

        reason="Acquisition protocol 'trigger_count' not present. To be added later."

    )

    def test_compiles_qblox_backend(self, mock_setup_basic_nv_qblox_hardware) -> None:

        # assert that files properly compile

        quantum_device: QuantumDevice = mock_setup_basic_nv["quantum_device"]

        qcompile(

        quantum_device: QuantumDevice = mock_setup_basic_nv_qblox_hardware[

            "quantum_device"

        ]

        schedule = qcompile(

            self.uncomp_sched,

            quantum_device.generate_device_config(),

            quantum_device.generate_hardware_config(),

        )

        assert not schedule.compiled_instructions == {}