Skip to content

Qblox ICCs - Fix for setting `scope_acq_sequencer_select` for QRM and QRM-RF (QAE-305)

Explanation of changes

This MR introduces:

  1. Qblox QCoDeS parameter scope_acq_sequencer_select was still being supplied as string seq1 etc, whereas since qblox-instruments v0.6.0 this needs to be sequencer index

    qcm_qrm.html#pulsar-qrm-pulsar-scope-acq-sequencer-select
    qcm_qrm.html#cluster-qrm-module-scope-acq-sequencer-select
    qcm_qrm.html#cluster-qrm-rf-module-scope-acq-sequencer-select

  2. Furthermore, fixes that for QRM-RF scope_acq_sequencer_select was not being supplied at all

  3. test_trace_acquisition_measurement_control & test_trace_acquisition_instrument_coordinator:

    • tests doing trace acquisitions using MC and using IC
    • IC test also verifying that scope_acq_sequencer_select is actually being set for Pulsar QRM, Cluster QRM and Cluster QRM-RF
  4. test_determine_scope_mode_acquisition_sequencer:

    • updated to reflect a case where sequencer index being set (in the test: 2) is other than the default (1)
    • as well as adding testing for QRM-RF
  5. Teardown/cleanup fixes to tests needed to make the suite runs as a whole, and some cleaning

Motivation of changes

Main change: In Sequencer init, we now pass index instead of name and supply that to QbloxBaseModule._construct_sequencers instead of name.


Merge checklist

See also merge request guidelines

  • Merge request has been reviewed and approved by a project maintainer.
  • Merge request contains a clear description of the proposed changes and the issue it addresses.
  • Merge request made onto appropriate branch (main for most MRs).
  • New code is fully tested.
  • New code is documented and docstrings use numpydoc format.
  • CHANGELOG.rst and AUTHORS.rst have been updated (when applicable).
  • CI pipelines pass
    • pre-commit run --all-files --hook-stage commit passes (gitlab-ci),
    • test suite passes (gitlab-ci),
    • no degradation in code-coverage (codacy),
    • no (serious) new pylint code quality issues introduced (codacy),
    • documentation builds successfully (CI and readthedocs),
    • windows tests pass (manually triggered by maintainers before merging).

For reference, the issues workflow is described in the contribution guidelines.

Edited by Edgar Reehuis

Merge request reports

Loading