DRAFT: Triton 200/ran exp dev #683
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
…fails sometimes for an unknown reason
# 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
qutech-lab
force-pushed
the
triton_200/ran_expDev
branch
from
d0ed3ef to
3c6ad68
Compare
This was referenced Jun 23, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes that need to be factored out:
Loop.__repr__cyclic graph check Fixes repr of Loop #771BinaryWaveformch2 markers inspection HDAWG: Right align channel 2 marker data in binary waveform #777filter_serializablesGive an exception with more context if deserialization fails #790_shrink_overlapping_windowsAdd automated mask shrinking #791Changes that need inspection as they possibly are superseded by or conflict with other changes in the master
FuntionPT.build_waveform