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

2019.2 Preperation #223

Merged
merged 107 commits into from
Oct 29, 2019
Merged

2019.2 Preperation #223

merged 107 commits into from
Oct 29, 2019

Conversation

grahamrow
Copy link
Member

Incorporate recent changes.

gribeill and others added 22 commits July 16, 2019 13:58
@gribeill
Add APS3 pattern generator and update channel library.
257cc45
@gribeill
Add APS3 pattern
4fa5ced
@gribeill
Modify GST code for newest pygsti stuff.
66191ce
@gribeill
Merge pull request #217 from BBN-Q/fix/new-pygsti-objects
2cffa24 
pyGSTi v0.9.8 compatbility
Updated APS3 functionality
c4aabfe
Merge branch 'develop' into feature/aps3-amc599
4b360a3
@BillyKalfus
Testing pulses on APS3
7888233
@BillyKalfus
Multiple timing issues fixed
d1ba16e
@BillyKalfus
Working APS3 driver
7edc0ed
@BillyKalfus
Fix error message
f206919
@BillyKalfus
Remove accidental commits
7a81a43
Add notes to channeldb
0fe920f
Merge pull request #220 from BBN-Q/feature/db-notes
0843f7c 
Optionally save notes to chan. library
Merge pull request #218 from BBN-Q/feature/aps3-amc599
2e9ff3e 
APS3Pattern
TDM input channels
7594475
Label to Crossbar
18dc28f 
and some comments
Merge pull request #221 from BBN-Q/feature/tdm-chan
4967e72 
TDM input channels
@ahelsing
Ignore .json~ files
85ba8d6
@ahelsing
Fix *Factory method documentation and add a little error checking
1b482ca
@ahelsing
Error check arguments to gaussian()
8edaefb
@ahelsing
Print PulseShapes more cleanly for debugging
86c91ac
@ahelsing
Error check instr argument to get_channels (handle getting a list of …
95ea71a 
…instructions). Error check return from get_channels in schedule (handle getting None)
@coveralls
Copy link

coveralls commented Sep 12, 2019 •
edited
Loading

Coverage Status

Coverage decreased (-8.8%) to 57.972% when pulling 823d9e6 on develop into 146a533 on master.

rblazarus and others added 26 commits October 11, 2019 09:24
@rblazarus
Adding path name
425d58d
Write TDM sequence
59fa519
Merge pull request #237 from BBN-Q/fix/write-tdm-seq
83ca7e6 
Write TDM sequence
@rblazarus
renaming index.md
0016417
@rblazarus
Update index.md
f40eab3
Merge pull request #235 from BBN-Q/rmfiles
f93f1b3 
removing obsolete files
@rblazarus
removing index.md, replaced by readme.md
2898a8f
@rblazarus
fixed link to config.py
5617685
@rblazarus
adding a reference to setup.py
960c0b5
@rblazarus
adding reference to config.py
130b09d
@rblazarus
correct typo
f874dfa
Set flux bias
0b65b39
Fix conda update
64b73b4
Merge pull request #238 from BBN-Q/feature/set-bias
838c65c 
Set flux bias
Merge branch 'develop' into feature/CNOT-imp2
9846fe0
Merge branch 'develop' into feature/CNOT-imp2
e3520ca
Read TDM instructions
4294e79 
Expected 4 character name
Don't define cnot_impl at edge creation
4397351
Merge pull request #239 from BBN-Q/fix/read-tdm
51cc860 
Read TDM instructions
Docstrings and fix new_edge
a33e376
Merge pull request #233 from BBN-Q/feature/CNOT-imp2
6aa21c3 
CNOT implem. as edge property
Merge pull request #232 from BBN-Q/print/cal_db
8b25b2c 
Print calibration log
@BillyKalfus
Fix typo in set frequency
aff1a7e
@BillyKalfus
Merge branch 'develop' of github.com:BBN-Q/QGL into develop
f51e84e
@gribeill
🐛 TDM trigger interval was never set.
6e066a8
@gribeill
Merge branch 'develop' of github.com:bbn-q/qgl into develop
823d9e6
grahamrow
grahamrow commented Oct 29, 2019
View reviewed changes
Copy link
Member Author

@grahamrow grahamrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good! Coveralls is not happy, so we need some APS3 pattern tests in particular.

@grahamrow grahamrow merged commit aa3deef into master Oct 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@grahamrow grahamrow

@gribeill gribeill

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@grahamrow @coveralls @dieris @gribeill @BillyKalfus @ahelsing @rblazarus @matthewware