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

Jump to bottom

Triton 200/to master #324

Merged
merged 35 commits into from Aug 3, 2018
Merged

Triton 200/to master #324

merged 35 commits into from Aug 3, 2018

Conversation

terrorfisch
Copy link
Member

I merged triton_200/master locally into the master

terrorfisch and others added 30 commits June 18, 2018 17:06
@terrorfisch
Do not use waveform duration directly
b138ac7
@terrorfisch
Fix bug of flatten_and_balance for leaves
f1f723a
@terrorfisch
Drop empty loops
45f789d
@terrorfisch
Merge remote-tracking branch 'origin/master' into triton_200/master
7a9feea
@terrorfisch
Include measurement parameters in RepetitionPT parameter_names
db88867
@pcerf @terrorfisch
Make pulse_seq nicer
956575d
@pcerf @terrorfisch
Important qc changes for calculating optimal pulse lengths, fixes to …
0c22c53 
…pulse_seq
@terrorfisch
pulse seq everything wrapped in repetition templates
3461e43
@M-superposition @terrorfisch
conf_seq, procfn_ops now with idicies (stating the operation the froc…
9644712 
…fn is applied to)
@pcerf @terrorfisch
rename add_custom_pulse_fn and fix a few minor bugs
da77bc3
@pcerf @terrorfisch
pulse_seq and conf_seq improvmeents
5fab2cb
@pcerf @terrorfisch
IMPORTANT: Order of data returned from operations was random in speci…
0ddd86e 
…al cases, leading to errors. Fixed now.
@pcerf @terrorfisch
tabor.py: Add convenience function to change (advanced) sequence tabl…
8cdffae 
…es on the fly
@pcerf @terrorfisch
+qc: Add convenience functions to change (advanced) sequence tables o…
3c42066 
…n the fly
@pcerf @terrorfisch
qc: Nice scan titles
f224e9d
@pcerf
Add newline in test setup output
10fdbac
@pcerf
Fix display titles in qc.conf_seq
c8f6071
@M-superposition @terrorfisch
sc
4276d70
@pcerf
Remove unnecessary security question
73b5ad4
@terrorfisch
Merge branch 'triton_200/master' of https://github.com/qutech/qc-toolkit
4c6082d 
 into triton_200/master
@M-superposition @terrorfisch
bugfix in qc.get/set_sequence_table and function to get an overview a…
a468684 
…bout the current program sequence tables
@terrorfisch
get and set pumping
ad10f06
@pcerf
Improve plotting
3b16007
@terrorfisch
custum cleanup fn and custum config fn now possible (eg for dnp) and …
2333ab9 
…new field plsdatat.awg.registeredPrograms.().added_to_pulse_duration and sc
@pcerf
Merge remote-tracking branch 'origin/master' into triton_200/master
89e4229
@terrorfisch
Reduce number of errors thrown by Alazar by changing aimed buffer size
8b2686c
@terrorfisch
Merge branch 'triton_200/master' of https://github.com/qutech/qc-toolkit
f159d18 
 into triton_200/master
@M-superposition @terrorfisch
sc
91019bb
@pcerf @terrorfisch
Add workaround for 4chan program errors
9af43c6
@pcerf @terrorfisch
Dont save everything form global_opts + small bugfix
8cfa807
@terrorfisch
Copy link
Member Author

Tests fail due to removed tabor optimization

@coveralls
Copy link

coveralls commented Aug 1, 2018 •
edited

Coverage Status

Coverage increased (+0.06%) to 94.501% when pulling 4e8af27 on triton_200/to_master into 9c858a5 on master.

@terrorfisch terrorfisch merged commit d1c618e into master Aug 3, 2018
@qutech-lab qutech-lab deleted the triton_200/to_master branch August 20, 2018 14:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@terrorfisch @coveralls @pcerf @M-superposition