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

Periodic merge with master #43

Merged
merged 57 commits into from
Oct 6, 2016
Merged

Periodic merge with master #43

merged 57 commits into from
Oct 6, 2016

Conversation

NielsBultink
Copy link
Contributor

No description provided.

elrama- and others added 30 commits September 12, 2016 21:21
This reverts commit 5a691f3.
Alpha version(still on test) of the distortions for flux pulses
commented
prepare_for_td  262-268
measure_rabi    447-452
elrama- and others added 27 commits October 2, 2016 21:05
Driver using direct comunication (telnet client)
This makes sure the tektronix sequencer always uses the latest version
of the channel settings.
@AdriaanRol AdriaanRol merged commit 828b3ae into master Oct 6, 2016
antsr pushed a commit that referenced this pull request Jul 10, 2020
analysis toolbox: improve latest_data() method (e.g., allow retrieving latest n measurement timestamps and folders)
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.

3 participants