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

Fix: awg5014 missing units #514

Merged
merged 2 commits into from
Mar 15, 2017
Merged

Conversation

jenshnielsen
Copy link
Collaborator

@WilliamHPNielsen

One missing units -> unit transition in the awg driver. Spotted during our work with the alazar driver

@@ -352,7 +352,7 @@ def __init__(self, name, address, timeout=180, **kwargs):
self.add_parameter(
'ch{}_m{}_del'.format(i, j),
label='Channel {} Marker {} delay'.format(i, j),
units='ns',
unit='ns',
Copy link
Contributor

Choose a reason for hiding this comment

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

Also I'd argue this should be seconds !

Copy link
Contributor

Choose a reason for hiding this comment

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

But let's wait for a later PR.

@@ -352,7 +352,7 @@ def __init__(self, name, address, timeout=180, **kwargs):
self.add_parameter(
'ch{}_m{}_del'.format(i, j),
label='Channel {} Marker {} delay'.format(i, j),
units='ns',
unit='ns',
Copy link
Contributor

Choose a reason for hiding this comment

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

But let's wait for a later PR.

@jenshnielsen jenshnielsen merged commit eb9ad30 into microsoft:master Mar 15, 2017
@jenshnielsen jenshnielsen deleted the awg_unit branch March 15, 2017 10:32
giulioungaretti pushed a commit that referenced this pull request Mar 15, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Fix: awg5014 missing units (#514)
giulioungaretti pushed a commit that referenced this pull request Mar 16, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Fix: awg5014 missing units (#514)
giulioungaretti pushed a commit that referenced this pull request Mar 16, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Fix: awg5014 missing units (#514)
giulioungaretti pushed a commit that referenced this pull request Mar 16, 2017
Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Fix: awg5014 missing units (#514)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants