Driver for Tektronix Oscilloscopes: MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX #1579

sohailc · 2019-05-23T21:52:09Z

This PR adds a driver for the following oscilloscopes: Tektronix MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX Series Digital Oscilloscopes.

…o_72004C

…ent type/source and getting the measurement value

…ther Enum.

…o_72004C

…ce or type and retrieving a measurement value is at least 0.1 second

astafan8

Left a few comments.

But my biggest problem is the conciseness of the example notebook :) could you make it more descriptive and explain how the driver works and how users can use it? preferably with some plain text next to the code :)

qcodes/instrument_drivers/tektronix/DPO7200xx.py

… endianness/bytes per samples/signed/unsigned. WIP: Figuring out how to perform/plot spectral analysis.

sohailc · 2019-05-25T00:01:07Z

@astafan8 Thanks so much for your comments. This was really helpful and I am adjusting my PR according to your comments. My latest commit is still work in progress. Let me send you a message when I think we should have a look at my PR again.

Thanks again!

…rent driver, factor code in a way that will make it possible to add support in the future without breaking the current interface.

2) Added comments in the example 3) Linting passes.

…o_72004C

…pynb

…fan8

…fan8

…fan8

…fan8

measurement_count -> number_of_measurements

sohailc · 2019-06-04T00:17:44Z

@astafan8 Can we have another look at this? I did my best to apply the modifications you suggested.

Thanks,

Sohail

astafan8

Thanks for the improvements!

I left a minor comment, and once you confirm that this code has been tested on the actual instrument and works ok, i'll merge.

More yaml-simulation-based tests would be better, but i leave this up to you.

qcodes/instrument_drivers/tektronix/DPO7200xx.py

2) fingers crossed that documents builder passes now

…o_72004C

astafan8

I'll merge after:

There is some sphinx issue that needs to be fixed for CI.
Was this code tested on a real device? (need a confirmation)

2) imporved docstrings

…dpo_72004C

codecov · 2019-06-05T17:41:22Z

Codecov Report

Merging #1579 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1579   +/-   ##
=======================================
  Coverage   72.34%   72.34%           
=======================================
  Files         116      116           
  Lines       12390    12390           
=======================================
  Hits         8964     8964           
  Misses       3426     3426

sohailc · 2019-06-05T20:47:14Z

@astafan8, please do not merge this yet. There are some missing features I forgot to add.

Specifically, I need to add a submodule for triggering configuration.

…ements. E.g. Instead of having to do `tek.measurement[0].type('amplitude')` followed by `tek.measurement[0].value()`, we can now simply do `tek.measurement[0].amplitude()`

De-approving the PR until a new feature is added

astafan8 · 2019-06-05T23:29:58Z

@sohailc ok, fine.

But why does that feature have to be added in THIS PR? Can't we merge this first, and then the submodule is added in another PR?

2) measurements is a list of tuples (name, unit)

sohailc · 2019-06-05T23:52:12Z

I thought it handier to add all needed features in this PR. Anyway, I have added the submodule now so if it passes the tests and you approve of the code, can you please merge it in.

astafan8

Good!

Merge: 5f6fd68 712c4b4 Author: Mikhail Astafev <astafan8@gmail.com> Merge pull request #1579 from sohailc/tek_dpo_72004C

sohailc added 12 commits May 6, 2019 14:59

work in progress

8a6a015

Merge branch 'master' of https://github.com/QCoDeS/Qcodes into tek_dp…

44ea805

…o_72004C

Merge branch 'master' of https://github.com/QCoDeS/Qcodes into tek_dp…

470ef79

…o_72004C

added driver for the DPO72004C

7b12910

added example for the DPO 72004C

e0c43df

added a measurement module

44fca97

we need to wait a minimum amount of time between setting the measurem…

b595a85

…ent type/source and getting the measurement value

Don't use the 'numbers' validator for the impedance parameter, but ra…

85b70a5

…ther Enum.

Merge branch 'master' of https://github.com/QCoDeS/Qcodes into tek_dp…

6ee93de

…o_72004C

added test to verify that the time between setting a measurement sour…

3cc687e

…ce or type and retrieving a measurement value is at least 0.1 second

make example notebook non-executing in sphinx

447d378

rename test_keithley_2450.py to test_Keithley_2450.py

df1a6b8

astafan8 reviewed May 24, 2019

View reviewed changes

parsing binary data in different formats now works, including varying…

8761492

… endianness/bytes per samples/signed/unsigned. WIP: Figuring out how to perform/plot spectral analysis.

sohailc added 10 commits May 29, 2019 13:34

Even though math and reference waveforms are not supported by the cur…

8f7ee94

…rent driver, factor code in a way that will make it possible to add support in the future without breaking the current interface.

work in progress

649c3fb

1) Tests pass again

d0ae04d

2) Added comments in the example 3) Linting passes.

Merge branch 'master' of https://github.com/QCoDeS/Qcodes into tek_dp…

993bc5a

…o_72004C

revert accidentally edited file: Qcodes example with Agilent 34400A.i…

bf43ce4

…pynb

use time.perf_counter() instead of time.time(), as suggested by @asta…

de7294a

…fan8

use time.perf_counter() instead of time.time(), as suggested by @asta…

79f9f16

…fan8

use perf_counter() everywhere

de7a117

channel_count -> number_of_channels

1da2e76

measurement_count -> number_of_measurements

add more comments in example file about future work

67a691a

astafan8 approved these changes Jun 4, 2019

View reviewed changes

qcodes/instrument_drivers/tektronix/DPO7200xx.py Show resolved Hide resolved

astafan8 and others added 3 commits June 4, 2019 14:33

Merge branch 'master' into tek_dpo_72004C

8459090

1) Slightly more comprehensive example notebook

fcf6ef3

2) fingers crossed that documents builder passes now

Merge branch 'master' of https://github.com/QCoDeS/Qcodes into tek_dp…

33e9228

…o_72004C

sohailc added 2 commits June 4, 2019 12:10

Merge remote-tracking branch 'sohail/tek_dpo_72004C' into tek_dpo_72004C

44d9709

using textwrap.dedent for docstring now

dc32941

astafan8 changed the title ~~Tek dpo 72004 c~~ Driver for Tektronix Oscilloscopes: MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX Jun 4, 2019

astafan8 added the driver label Jun 4, 2019

astafan8 previously approved these changes Jun 4, 2019

View reviewed changes

astafan8 and others added 4 commits June 5, 2019 00:28

Merge branch 'master' into tek_dpo_72004C

9277491

Merge branch 'master' into tek_dpo_72004C

3e2d01a

1) completed type hints

438b48f

2) imporved docstrings

Merge remote-tracking branch 'qcodes-sohail/tek_dpo_72004C' into tek_…

5c77d21

…dpo_72004C

sohailc added 2 commits June 5, 2019 14:55

1) Added the triggering module, including examples

9a68c5e

The measuring module contains parameters with the names of the measur…

4492d5c

…ements. E.g. Instead of having to do `tek.measurement[0].type('amplitude')` followed by `tek.measurement[0].value()`, we can now simply do `tek.measurement[0].amplitude()`

1) Tests pass again

1e01ae1

2) measurements is a list of tuples (name, unit)

sightly better code formatting

712c4b4

astafan8 approved these changes Jun 6, 2019

View reviewed changes

astafan8 merged commit 657399c into microsoft:master Jun 6, 2019

giulioungaretti pushed a commit that referenced this pull request Jun 6, 2019

Generated gh-pages for commit 657399c

0968979

Merge: 5f6fd68 712c4b4 Author: Mikhail Astafev <astafan8@gmail.com> Merge pull request #1579 from sohailc/tek_dpo_72004C

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Driver for Tektronix Oscilloscopes: MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX #1579

Driver for Tektronix Oscilloscopes: MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX #1579

sohailc commented May 23, 2019

astafan8 left a comment

sohailc commented May 25, 2019

sohailc commented Jun 4, 2019

astafan8 left a comment

astafan8 left a comment

codecov bot commented Jun 5, 2019 •

edited

sohailc commented Jun 5, 2019 •

edited

astafan8 commented Jun 5, 2019

sohailc commented Jun 5, 2019

astafan8 left a comment

Driver for Tektronix Oscilloscopes: MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX #1579

Driver for Tektronix Oscilloscopes: MSO/DPO5000/B, DPO7000/C, DPO70000/B/C/D/DX, DSA70000/B/C/D, and MSO70000/C/DX #1579

Conversation

sohailc commented May 23, 2019

astafan8 left a comment

Choose a reason for hiding this comment

sohailc commented May 25, 2019

sohailc commented Jun 4, 2019

astafan8 left a comment

Choose a reason for hiding this comment

astafan8 left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 5, 2019 • edited

Codecov Report

sohailc commented Jun 5, 2019 • edited

astafan8 commented Jun 5, 2019

sohailc commented Jun 5, 2019

astafan8 left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 5, 2019 •

edited

sohailc commented Jun 5, 2019 •

edited