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

AWG 5014 ref clock bad parameter name /confusion #537

Closed
AdriaanRol opened this issue Mar 23, 2017 · 2 comments
Closed

AWG 5014 ref clock bad parameter name /confusion #537

AdriaanRol opened this issue Mar 23, 2017 · 2 comments

Comments

@AdriaanRol
Copy link
Contributor

The AWG 5014 driver has two distinct "parameters" in the hardware,

  • Clock source -> int or ext
  • Reference oscillator -> int or ext
    image

The recently updated 5014 driver introduces a 'parameter' ref_clock_source.
https://github.com/QCoDeS/Qcodes/blob/master/qcodes/instrument_drivers/tektronix/AWG5014.py#L160
This refers to using an internal or external clock and and has nothing to do with the reference oscillator, making this a confusing name.
Additionally there is no parameter that sets the reference oscillator.

The driver does contain some reference to these parameter under their proper name.
https://github.com/QCoDeS/Qcodes/blob/master/qcodes/instrument_drivers/tektronix/AWG5014.py#L847-L852

I would suggest the following fix.

  • Rename the ref_clock_source parameter to clock_source.
  • Add a parameter for the reference_source
    Both of these names are the names that the AWG uses internally, both in it's GUI as in it's sequencer config.

@WilliamHPNielsen as author of the recent fix, do you agree with these changes? If so I will be sending a PR shortly.
AdriaanRol added a commit to DiCarloLab-Delft/Qcodes that referenced this issue Mar 23, 2017
@AdriaanRol
Chanes to close microsoft#537
7ddd6b9 
Adds clock_source and ref_source parameters
Also added a change to the get parser of the lowpass filter setting. The
value 9.9e37 corresponds to infinity but can give problems when sending
it over a port (such as to pyqtgraph).
@AdriaanRol AdriaanRol mentioned this issue Mar 23, 2017
Merged
@nataliejpg
Copy link
Contributor

totally agree with @AdriaanRol, have been meaning to flag this up but got distracted/waylaid. At the moment initialising the qcodes instrument seems to set the reference source to internal even if it the instrument previously was set to external but I hadn't dug into what the parameter was actually doing.

@AdriaanRol
Copy link
Contributor Author

@nataliejpg have you seen #538 ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@nataliejpg @AdriaanRol