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

Spectrum M4i: improve blockavg functionality and add acquisition functions #970

Merged
merged 6 commits into from
Feb 21, 2018

Conversation

peendebak
Copy link
Contributor

This PR does the following:

  • Allows the blockavg_hardware_trigger_acquisition to use naverages=1
  • Add functions to start data acquisition and retrieve data independently (all functions so far combined these two). Any suggestions for the names start_acquisition and retrieve_data are welcome.
  • Put common code into _transfer_buffer_numpy

@jenshnielsen @WilliamHPNielsen

@codecov
Copy link

codecov bot commented Feb 13, 2018

Codecov Report

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

@@           Coverage Diff           @@
##           master     #970   +/-   ##
=======================================
  Coverage   78.61%   78.61%           
=======================================
  Files          45       45           
  Lines        6419     6419           
=======================================
  Hits         5046     5046           
  Misses       1373     1373

@peendebak peendebak closed this Feb 13, 2018
@peendebak peendebak reopened this Feb 13, 2018
@jenshnielsen jenshnielsen changed the title improve blockavg functionality and add acquisition functions Spectrum M4i: improve blockavg functionality and add acquisition functions Feb 14, 2018
Copy link
Collaborator

@jenshnielsen jenshnielsen left a comment

Choose a reason for hiding this comment

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

Looks fine to me but I have no way of testing

I took the liberty to change the name of this pr to include the instrument. Please do this in the future as it makes it much simpler to see what it's about

@WilliamHPNielsen WilliamHPNielsen merged commit 325d60e into microsoft:master Feb 21, 2018
giulioungaretti pushed a commit that referenced this pull request Feb 21, 2018
Author: peendebak <P.T.eendebak@tudelft.nl>

    Spectrum M4i: improve blockavg functionality and add acquisition functions (#970)
@eendebakpt eendebakpt deleted the feat/m4ii branch January 11, 2019 11:03
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

3 participants