Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from experiment (selene) #569

Open
wants to merge 25 commits into
base: master
Choose a base branch
from

Conversation

shumpohl
Copy link
Member

TODO:

  • review
  • factor out MATLAB changes?

thangleiter and others added 25 commits April 7, 2021 10:33
resolve_mappings() resolves software AWG channels into hardware channels
(eg HDAWG_A). The default mapping is stored in plsdata.
If defer_markers is true, the markers are set to inf, meaning that
the qupulse program handles the markers.
The default config is now a separate property that is not overwritten
# Conflicts:
#	qupulse/hardware/dacs/alazar.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants