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

refactor awg file handling in awg5014 driver and introduce QCoDeS @deprecated decorator #1066

Merged
merged 11 commits into from
Jun 15, 2018

Conversation

nataliejpg
Copy link
Contributor

@nataliejpg nataliejpg commented Apr 19, 2018

The existing driver had 'make_and_save' and 'make_send_and_load' which means that the code for packing a waveform list is copied in two places and also that the sequence 'make', 'save', 'send' and 'load' is not possible without making twice. I pulled out these functions and left the original two to call them so it shouldn't break it for anyone using the old ones. Thoughts welcome :)

  • test it

@WilliamHPNielsen

@codecov
Copy link

codecov bot commented May 23, 2018

Codecov Report

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

@@           Coverage Diff           @@
##           master    #1066   +/-   ##
=======================================
  Coverage   79.75%   79.75%           
=======================================
  Files          46       46           
  Lines        6647     6647           
=======================================
  Hits         5301     5301           
  Misses       1346     1346

@WilliamHPNielsen
Copy link
Contributor

@nataliejpg, you are absolutely right. I put one of my best men on this :)

@Dominik-Vogel
Copy link
Contributor

I added a deprecation warning for the generate_awg_file method, to remove some of the confusion the user experiences when seeing this function and make_awg_file. I tested it with the sample notebooks and it seems to work without any problems.
I think we can merge this for now and do any further refactoring in a new pr.

@Dominik-Vogel Dominik-Vogel changed the title refactor awg file handling in awg5014 driver refactor awg file handling in awg5014 driver and introduce QCoDeS @deprecated decorator Jun 13, 2018
@nataliejpg
Copy link
Contributor Author

sounds great. Thanks @Dominik-Vogel.

Copy link
Contributor

@Dominik-Vogel Dominik-Vogel left a comment

Choose a reason for hiding this comment

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

👍 refactoring

@@ -903,7 +906,7 @@ def generate_channel_cfg(self):
been changed from their default value and put them in a
dictionary that can easily be written into an awg file, so as
to prevent said awg file from falling back to default values.
(See self.generate_awg_file and self.AWG_FILE_FORMAT_CHANNEL)
(See self.make_awg_file and self.AWG_FILE_FORMAT_CHANNEL)
Copy link
Collaborator

Choose a reason for hiding this comment

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

You could use actual sphinx links here. https://kev.inburke.com/kevin/sphinx-interlinks/

@WilliamHPNielsen WilliamHPNielsen merged commit b6ba8d1 into microsoft:master Jun 15, 2018
giulioungaretti pushed a commit that referenced this pull request Jun 15, 2018
Merge: c5ece79 f85dfee
Author: William H.P. Nielsen <whpn@mailbox.org>

    Merge pull request #1066 from nataliejpg/refactor/awg5014c_driver
@nataliejpg nataliejpg deleted the refactor/awg5014c_driver branch December 10, 2018 14:26
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

4 participants