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

driver/Keysight Infiniium oscilloscope (as e.g. MSOS104A) #766

Merged
merged 13 commits into from
Oct 18, 2017

Conversation

Dominik-Vogel
Copy link
Contributor

@Dominik-Vogel Dominik-Vogel commented Sep 27, 2017

This is the driver for the Keysight Infiniium oscilloscopes. It has been developed for the MSOS104A. So far it features all the basic commands, including:

  • time scale
  • channels
  • trigger
  • acquisition of up to 500M points (non streaming mode)

To get started please refer to the jupyter tutorial for this driver, supplied along with this PR.
fixes #701
The driver development has been simultaneously started by Steven Waddy. In the first commit I merged the two drivers.

@Dominik-Vogel Dominik-Vogel self-assigned this Sep 27, 2017
@WilliamHPNielsen WilliamHPNielsen changed the title initial commit + incorporating code from Steven Waddy driver/Keysight MSOS104A Sep 28, 2017
#
self.shape = (npts,)
self.set_sweep(start, stop, npts)
#TODO: fix above set when any of the above things change
Copy link
Collaborator

Choose a reason for hiding this comment

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

due to limitations in the dataset this cannot be set in the get command as the setpoints have already been written to fil

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you, this is a good hint!

params_to_skip_update=params_to_skip_update)


class MSOS104A(VisaInstrument):
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think it should have a more generic name the only difference that i can tell is the max frequency

@Dominik-Vogel Dominik-Vogel changed the title driver/Keysight MSOS104A driver/Keysight Infiniium oscilloscope (as e.g. MSOS104A) Oct 3, 2017
Copy link
Contributor

@WilliamHPNielsen WilliamHPNielsen left a comment

Choose a reason for hiding this comment

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

Regarding the notebook: This should explain how to get a QCoDeS dataset back, i.e. rather than just calling get on the trace parameter, there should be a Measure or even a Loop.

Copy link
Contributor

@WilliamHPNielsen WilliamHPNielsen left a comment

Choose a reason for hiding this comment

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

Regarding the driver code: a bit of PEP8'ing would be good and please add type hints because we are so cool and futuristic that we use them.

@WilliamHPNielsen
Copy link
Contributor

Nice notebook!


def snapshot_base(self, update: bool=False) -> Dict:
params_to_skip_update = ['trace']
super().snapshot_base(update=update,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is missing a return statement

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! I fixed this.


# compatitbility/setup
# change of names with acquire_ prefix
# add acquire_interpolate(1) to the setup
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should these lines still be her?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nope...

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.

👍

@jenshnielsen jenshnielsen merged commit fda5222 into microsoft:master Oct 18, 2017
giulioungaretti pushed a commit that referenced this pull request Oct 18, 2017
Author: Dominik Vogel <30660470+Dominik-Vogel@users.noreply.github.com>

    driver/Keysight Infiniium oscilloscope (as e.g. MSOS104A) (#766)
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.

Keysight Infiniium S series scope drivers
3 participants