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.

Sign up for GitHub

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 (helios) #570

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

Changes from experiment (helios) #570

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e07213b
Make flatten and balance work on single waveform playbacks
terrorfisch Feb 24, 2021
2fd2014
Add a setup function for the Tektronix AWG5014
Feb 25, 2021
15bd476
Merge remote-tracking branch 'qutech-lab/triton_200/master'
Feb 25, 2021
6e9209b
Modify conf_seq for HBT Sample
Feb 26, 2021
b93262a
Add query function for Tek amplitudes as needed for qc.awg_program
Feb 26, 2021
f95487c
Use functions pprovided by the driver instead of direct queries
Feb 26, 2021
db28104
Merge remote-tracking branch 'qutech-lab/triton_200/master'
Feb 26, 2021
16e84cd
Add toSingleWaveform functionality to qc
Mar 23, 2021
2c60e59
Fix small errors in setup_tek_awg
Mar 23, 2021
9eb642b
Change setup to 1 Qubit
Mar 23, 2021
91d713c
Add interface to use atsaverage auto rearm
terrorfisch Mar 23, 2021
ae63cfb
Merge remote-tracking branch 'origin/feat/alazar_auto_trigger'
Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'qutech-lab/triton_200/master'
  • Loading branch information
Rene Otten committed Feb 26, 2021
commit db28104fbf73a19e201451276ba3cdab7d6cdaf5

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.