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 #2

Merged
merged 16 commits into from
Mar 12, 2017
Merged

Feature/signadyne digitizer #2

merged 16 commits into from
Mar 12, 2017

Conversation

maij
Copy link
Collaborator

@maij maij commented Mar 7, 2017 •
edited
Loading

Adds stub driver for Signadyne digitizer cards.

Changes proposed in this pull request:

  • Generic driver for Signadyne Digitizers
  • Created all necessary settable and gettable parameters
  • Concept for instantiating combination (AWG+DIG) cards in M3300.

@lgnjanssen

maij added 16 commits March 6, 2017 14:09
@maij
Initial commit of general Signadyne digitizer implementation, as well…
caa281e 
… as a skeleton for the M3300A combo card.
@maij
Changed init command to take kwargs. Fixed some line endings.
86a49a7
@maij
Added a test class for the Signadyne digitizer base class.
c74fc38 
Also removed unnecessary wrapper functions in the base class.
@maij
Changed the implementation of trigger threshold and mode from paramet…
b7b58cd 
…ers to private attributes with set and get functions.
@maij
fix : Make __trigger_mode and __trigger_threshold object variables, n…
82bfce8 
…ot class variables. This should be convention for all future variables.
@maij
Adding a set of default values to be used by get/set functions before…
6b47915 
… parameters can be defined.
@maij
Added all necessary parameters without set/get commands defined.
17d0770 
Also created internal variable storage to aid get/set commands with first time execution.
@maij
Fixed references to SD_TriggerModes.
a90e7a2 
Fixed some missing parentheses.
@maij
Created set functions for all parameters, yet to be implemented.
74118c8
@maij
Fixed syntactical issues, simplified variables and removed unused var…
e309079 
…iable from parameters.
@maij
Defined settable+gettable parameters set+get commands.
dd26f2d
@maij
Fixed some labelling issues with only settable parameters, and remove…
323da65 
…d their get cmd definitions.
@maij
Fix: Move class variables outside of look and create list all at once.
35b0484 
Changed library location to be ~/site_packages/signadyne.py to agree with SD AWG driver.
@maij
Fix : added self references to ensure instantiance funcs of SD_AIN ar…
d52ec19 
…e used instead of class funcs.

Small corrections to some validator declarations.
@maij
Fix : added self reference to all class functions to ensure they can …
c5413bc 
…be shared with other funcitons.
@maij
Added more parameters to manage the SD funcs DAQconfig and DAQtrigger…
3c54384 
…ExternalConfig
@lgnjanssen lgnjanssen merged commit aa56b77 into feature/signadyne_driver Mar 12, 2017
@maij maij deleted the feature/signadyne_digitizer branch March 12, 2017 23:36
astafan8 pushed a commit that referenced this pull request Jun 14, 2018
@ThorvaldLarsen
Merge pull request #2 from QCoDeS/master
ce910b3 
Update
astafan8 pushed a commit that referenced this pull request Jun 14, 2018
@WilliamHPNielsen
Merge pull request #2 from jenshnielsen/docs/dataset/measurement_cont…
f3d37e8 
…ainer

Call get_DB_debug and make sure its cast to bool
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.
2 participants
@maij @lgnjanssen