fix: multiple sequencers to use the same acquisition channel

Explanation of changes

This is a fix for multiple sequencers/modules/clusters to use the same acquisition channel.

  • ClusterComponent.retrieve_acquisition merges the data now correctly (`.update does not merge the data, but overrides it).
  • check_already_existing_acquisition works also: needed to check if the two common DataArrays are empty with if len(common_0) and len(common_1):. If any of them is empty, it can't do the check.
  • The add_acquisition_coords_binned works even if the DataArray is missing some acquisition indices from the acquisition channel. This means that the function also works if for example the acquisition channel has 100 acquisition indices, but the input DataArray only has 1 of the acquisition indices present.

Merge checklist

See also merge request guidelines

  • Merge request has been reviewed (in-depth by a knowledgeable contributor), and is approved by a project maintainer.
  • New code is covered by unit tests (or N/A).
  • New code is documented and docstrings use numpydoc format (or N/A).
  • New functionality: considered making private instead of extending public API (or N/A).
  • Public API changed: added @deprecated and entry in deprecated code suggestions (or N/A).
  • Newly added/adjusted documentation and docstrings render properly (or N/A).
  • Pipeline fix or dependency update: post in #software-for-developers channel to merge main back in or update local packages (or N/A).
  • Tested on hardware (or N/A).
  • CHANGELOG.md for breaking changes and AUTHORS.md have been updated (or N/A).
  • Update Hardware backends documentation if backend interface change or N/A
  • Check whether performance is significantly affected by looking at the Performance metrics results.
  • Windows tests in CI pipeline pass (manually triggered by maintainers before merging).
    • Maintainers do not hit Auto-merge, we need to actively check as manual tests do not block pipeline

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

Edited by Gábor Oszkár Dénes

Merge request reports

Loading