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

DRAFT: Triton 200/ran exp dev #683

Closed
wants to merge 31 commits into from

Conversation

terrorfisch
Copy link
Member

@terrorfisch terrorfisch commented Sep 23, 2022

Fixes that need to be factored out:

Changes that need inspection as they possibly are superseded by or conflict with other changes in the master

  • Expression.evaluate_in_scope
  • FuntionPT.build_waveform
  • Arithmetic pulse templates operator map
  • AlazarProgram and friends

thangleiter and others added 30 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
# Conflicts:
#	qupulse/hardware/awgs/zihdawg.py
…n_expDev

# Conflicts:
#	qupulse/expressions.py - accepted
#	qupulse/hardware/dacs/alazar.py - keep the local version
#	qupulse/pulses/arithmetic_pulse_template.py - keep the local version
@github-actions
Copy link

Test Results

    6 files  6 suites   53s ⏱️
  44 tests 0 ✔️ 0 💤 0    44 🔥
178 runs  0 ✔️ 0 💤 0  178 🔥

For more details on these errors, see this check.

Results for commit 3c6ad68.

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