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

Feature/signadyne digitizer integration #5

Merged
merged 17 commits into from
Mar 22, 2017
Merged

Feature/signadyne digitizer integration #5

merged 17 commits into from
Mar 22, 2017

Conversation

maij
Copy link
Collaborator

@maij maij commented Mar 15, 2017 •
edited
Loading

Changes proposed in this pull request:

  • Integrated the SD_DIG class with the SD_Module implementation
  • Changed to new Keysight library
  • Changed M3300 file to contain two classes for the separate AWG, DIG functionality.
  • Test basic AWG functionality
  • Test basic DIG functionality
  • Implement result parsing (for errors)
  • Wrapped most library get functions

@lgnjanssen

maij added 17 commits March 15, 2017 14:19
@maij
fix: make all internal function calls go through self
633fd1a
@maij
refactor: make SD_DIG a subclass of SD_Module, and so change __init__…
6d16eac 
… args.
@maij
fix: change libraries to newer keysight libs, and use correct method …
943f8a0 
…to import classes from a file
@maij
fix: change top level class for the M3300 card to two separate classe…
29c3c63 
…s for the digitizer and AWG functionality
@maij
fix: indentation in the M3300 card and change library reference to us…
eacbd60 
…e relative addressing.
@maij
fix: open the device during SD_DIG.__init__()
3a813ca
@maij
fix: change channel triggering to accept correct range of values, als…
d5d6d9a 
…o replace old variable __analogTriggerMode
@maij
fix: refer to self for all internal variables, also fix set_points_pe…
7938313 
…r_cycle to allow for partial application.
@maij
refactor: fix whitespace
54bb121
@maij
fix: refer to SD_Module class through relative addressing.
d267e5f
@maij
feat: added test suite for M3300A AWG driver (duplicated from existin…
b105666 
…g test suite)
@maij
feat: add verbose printing and error parsing for set and DAQ functions.
13a485a
@maij
feat: add wrapper for library get_cmds to enable result parsing
a92dfc9
@maij
refactor: deprecate get_trigger_threshold and get_trigger_mode as the…
f980993 
…re is no real reason to use a get_cmd rather than get_latest for a purely settable device parameter
@maij
fix: add instance to result parser for DAQ_read numpy arrays
996844b
@maij
fix: remove deprecated decorator as the decorator is not defined
385b484
@maij
fix: add missing 'or' operator
73c89f4
@maij maij merged commit ef1380e into feature/signadyne_driver Mar 22, 2017
@maij maij deleted the feature/signadyne_digitizer_integration branch March 22, 2017 23:30
astafan8 pushed a commit that referenced this pull request Jun 14, 2018
@ThorvaldLarsen
Merge pull request #5 from QCoDeS/master
09826ad 
Update branch
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.
1 participant
@maij