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

driver/AWG70000A broadbean compatibility #911

Conversation

WilliamHPNielsen
Copy link
Contributor

@WilliamHPNielsen WilliamHPNielsen commented Dec 11, 2017

To make the AWG70000A .seqx file generation play nicely with broadbean, some code restructuring and slight API changes are needed in the AWG70000A driver. This PR introduces those.

Changes proposed in this pull request:

  • make makeSEQXFile take numpy arrays rather than .wfmx files as input
  • update the documentation to reflect the changes

There is a parallel PR in broadbean about this: QCoDeS/broadbean#47.

@jenshnielsen

makeSEQXFile should not take .wfmx files as its input, since that
creates a dependence on having this module to be able to generate a
valid input for makeSEQXFile
flat_wfmxs += [AWG70000A.makeWFMXFile(wfm, amplitude)
for wfm in wfm_lst]

# flat_wfmxs = [wfmx for lst in wfms for wfmx in lst]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should this stay?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope!

@codecov
Copy link

codecov bot commented Dec 12, 2017

Codecov Report

Merging #911 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #911   +/-   ##
=======================================
  Coverage   78.63%   78.63%           
=======================================
  Files          33       33           
  Lines        4536     4536           
=======================================
  Hits         3567     3567           
  Misses        969      969

@jenshnielsen
Copy link
Collaborator

Apart from the commented out line that should be removed this looks fine

@WilliamHPNielsen WilliamHPNielsen merged commit d072ab8 into microsoft:master Dec 13, 2017
@WilliamHPNielsen WilliamHPNielsen deleted the driver/AWG70000A_broadbean_changes branch December 13, 2017 15:56
giulioungaretti pushed a commit that referenced this pull request Dec 13, 2017
Author: William H.P. Nielsen <whpn@mailbox.org>

    driver/AWG70000A broadbean compatibility (#911)
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.

None yet

2 participants