Periodic merge of develop into master #499
Merged
Conversation
This file contains 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
…rmonicity measurements
Prepared function multipath_filter2 for new firmware release. The default value for the argument ppl now corresponds to the new number of pipeline stages (2) of the hardware filter that will be deployed to the QuSurf customers.
…-Delft/PycQED_py3 into develop_awgv1_devices
…CarloLab-Delft/PycQED_py3 into develop_awgv1_devices" This reverts commit 066b3c3, reversing changes made to 31ee0be.
…b.com/DiCarloLab-Delft/PycQED_py3 into develop_awgv1_devices"" This reverts commit ffe4d87.
…ant for qubit and bus resonator to dac scans
…-Delft/PycQED_py3 into develop_awgv1_devices
…nst missing uncertainty
…-Delft/PycQED_py3 into develop_awgv1_devices
with geralization to recognize awg channels used to do mw pulses
…-Delft/PycQED_py3 into develop_awgv1_devices
Cz flux arc fix
Enh/sliding pulses
|
As a comment: you use sometimes |
|
@slavoutich , thanks for pointing that out. I'll use double brackets from now on. |
|
@elrama- , gentle reminder |
|
I have been checking it, but still not finished on my check-up. Will give an update in a day. |
|
@elrama- , thanks for the update |
elrama-
approved these changes
Sep 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Periodic merge.
Reasons to merge
Requesting @elrama- to review as he is not currently working on develop.