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

LeCroy T3DSO1204 Oscilloscope #697

Closed
wants to merge 122 commits into from
Closed
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
1cd00a0
LeCroy T3DSO1204 Oscilloscope
LastStarDust Sep 30, 2022
c2fe61b
Short documentation about LeCroy T3DSO1204 Oscilloscope
LastStarDust Sep 30, 2022
52a8eba
Set line wrap at 100 characters to make flake8 happy
LastStarDust Oct 3, 2022
8711716
Stripped whitespaces from docstrings to make flake8 happy
LastStarDust Oct 3, 2022
b705296
Added links to the instruments class in docs and __init__.py
LastStarDust Oct 3, 2022
e5651ef
Uncommented skip test directive in unit test with device
LastStarDust Oct 3, 2022
7956643
Small fixes requested in the pull request comments
LastStarDust Oct 3, 2022
89cec68
Fixed docstrings to make sphinx happy
LastStarDust Oct 3, 2022
983f52a
Removed useless sanitize_dictionary method
LastStarDust Oct 3, 2022
5bf0538
Unit tests of communication protocol that can be run without a device
LastStarDust Oct 3, 2022
b9aeffa
Bugfixes regarding the parsing of input/output of instrument properties
LastStarDust Oct 3, 2022
65d5e3a
Uncommented skip test directive in unit test with device
LastStarDust Oct 3, 2022
ea309a1
All string parameters are now defined as lowercase for consistency
LastStarDust Oct 3, 2022
8c1a8f5
bind static methods explicitly, passing in a dummy context
LastStarDust Oct 3, 2022
4eae028
Python 3.9 and before really doesn't like calling static methods
LastStarDust Oct 3, 2022
3839b54
Directly use scope variables in unit test with device
LastStarDust Oct 4, 2022
266aba3
Added tweakable recommended sleep time between commands
LastStarDust Oct 4, 2022
196d77f
Fixed bug introduced in previous commits
LastStarDust Oct 4, 2022
f7318da
Update pymeasure/instruments/lecroy/lecroyT3DSO1204.py
LastStarDust Oct 4, 2022
7903d76
I keep forgetting to uncomment this line
LastStarDust Oct 4, 2022
0f2fd74
Removed useless _MATCH_INT variable
LastStarDust Oct 4, 2022
f812262
Add unit test to test skew_factor property
LastStarDust Oct 4, 2022
19a43ea
Fixed range of channel skew factor
LastStarDust Oct 4, 2022
5887d6f
More consistent formatting of SCPI messages
LastStarDust Oct 7, 2022
4dc1fcd
Improved documentation and variable names
LastStarDust Oct 7, 2022
db0c12d
Fixed docstring indentation
LastStarDust Oct 7, 2022
7a18226
Added partial support for math operators
LastStarDust Oct 8, 2022
fd28778
Improvement to skew_factor property suggested by Christoph Buchner
LastStarDust Oct 11, 2022
c20760f
Acquisition sample size property (SANU? query)
LastStarDust Oct 11, 2022
72c3d57
memory size property (MSIZ? query)
LastStarDust Oct 11, 2022
8b3bfbf
72c3d5
LastStarDust Oct 11, 2022
b479827
Block if the user tries to send commands faster than a certain rate
LastStarDust Oct 11, 2022
5d06cf1
Command header property (CHDR command)
LastStarDust Oct 11, 2022
b828d56
Debugged waveform download (many thanks to Bastian Leykauf)
LastStarDust Oct 11, 2022
58023df
Remove needless sleep calls in tests
LastStarDust Oct 11, 2022
fcf1b03
Only query about average points if the acquisition type is "average"
LastStarDust Oct 11, 2022
1921095
Debugged downloading of waveform data
LastStarDust Oct 11, 2022
945867a
Fixed unit tests
LastStarDust Oct 11, 2022
3c08010
Skip unit tests if they are meant to be run by a human or are failing
LastStarDust Oct 12, 2022
2b92a7c
Added fixed requested in pull request 697
LastStarDust Oct 12, 2022
28a2145
Reverted previous commit
LastStarDust Oct 12, 2022
2ca80be
Fixed bug in _sanitize_source helper function
LastStarDust Oct 12, 2022
d34f0ae
Improvement suggested by Christoph Buchner in PR 697
LastStarDust Oct 12, 2022
643ad37
single entry point for `acquisition_sample_size_cX` methods
LastStarDust Oct 12, 2022
f5080ee
Fixed bug in download_data when the number of requested points is max
LastStarDust Oct 12, 2022
e5989d3
More info in waveform preamble
LastStarDust Oct 12, 2022
40e7c38
Remove bitstring dependency
LastStarDust Oct 14, 2022
ff305f8
Remove unneeded check in _ChunkResizer
LastStarDust Oct 14, 2022
bb59bd1
More concise selection of channel object from channel name or index
LastStarDust Oct 14, 2022
35c2c67
Typos in docstrings
LastStarDust Oct 14, 2022
21c9431
Suggested default value in docstring would lead to exception
LastStarDust Oct 14, 2022
5f726b7
Do not request for waveform header twice
LastStarDust Oct 14, 2022
7806ed4
PR 660 has been merged so no need to skip that unit test
LastStarDust Oct 14, 2022
cfce4a3
Fixed and improved download_data unit tests with and without device
LastStarDust Oct 14, 2022
6e8c981
Split the download_data method in smaller chunks (pun intended)
LastStarDust Oct 14, 2022
64a02c5
Fixed unit tests
LastStarDust Oct 14, 2022
6f95322
Added docstring to _process_data method
LastStarDust Oct 14, 2022
3778d8c
Removed unneeded TODOs
LastStarDust Oct 14, 2022
cb68137
Report Y-axis units in waveform preamble
LastStarDust Oct 14, 2022
3f5d5c8
Bugfix in _acquire_data (source was used before being set)
LastStarDust Oct 14, 2022
6ea642f
Bugfix of a bug introduced in the previous bugfix
LastStarDust Oct 14, 2022
70961eb
Sanitize source string and then always use self.waveform_source
LastStarDust Oct 14, 2022
74fec5d
I found a bug in the scope firmware but it can be avoided by software
LastStarDust Oct 21, 2022
75bdd81
Fixed previous commit : I meant divide and not multiply
LastStarDust Oct 21, 2022
78190d1
Fixed bug in math_define syntax
LastStarDust Oct 21, 2022
ddb3f3a
Fixed waveform scaling when source is math
LastStarDust Oct 24, 2022
f76d992
Fixed waveform scaling when source is math, again
LastStarDust Oct 24, 2022
abd2191
Improved and debugged waveform download
LastStarDust Oct 25, 2022
e9298f0
Fixed unit tests (maybe)
LastStarDust Oct 25, 2022
92ffba0
Forgot to uncomment some stuff
LastStarDust Oct 25, 2022
ee16a4c
Make acquiring only one data point faster
LastStarDust Oct 26, 2022
37ed2e7
Fixed unit tests
LastStarDust Oct 26, 2022
9e50639
Decreased adapter timeout
LastStarDust Oct 27, 2022
cea6ad2
No need to set the trigger type every time we arm the acquisition
LastStarDust Oct 28, 2022
b4a3faa
Revert commit about trigger level
LastStarDust Oct 28, 2022
577f61d
Better channel name sanitizing
Nov 12, 2022
8d1cc04
Fixed typos
LastStarDust Nov 12, 2022
369ba6e
Improved docstring of "display" property
LastStarDust Nov 12, 2022
9c071e0
Improved docstring of boolean properties
Nov 12, 2022
8f45997
Moved __init__ to the beginning of the class
Nov 12, 2022
4edc350
Use setattr in order to set the current value
Nov 12, 2022
94f02ec
Improved docstring of "_comm_header" property
Nov 12, 2022
3813c1a
Fixed typos
LastStarDust Nov 12, 2022
90581f6
Fixed typos
LastStarDust Nov 12, 2022
85fa216
Fixed mistake
LastStarDust Nov 12, 2022
b480cb9
Fixed typos
LastStarDust Nov 12, 2022
429cb3c
renamed SLEEP_SECONDS to WRITE_INTERVAL_S
Nov 12, 2022
f4f6613
Every adapter has a connection so I remove the "hasattr" check.
Nov 12, 2022
b9cdef8
Fixed typos
Nov 12, 2022
c8eea2d
Fixed typos and docstrings
Nov 12, 2022
79202cd
Combined waveform header and footer sanity checks into one
Nov 12, 2022
6f5dafc
Fixed typo
LastStarDust Nov 12, 2022
67a1f00
Converted trigger_50 property into center_trigger method
Nov 12, 2022
396219f
Improved docstring of trigger_select
Nov 12, 2022
2135cd8
First set and then read in unit tests
Nov 12, 2022
edd643b
Rename "single" method into "arm_acquisition"
Nov 13, 2022
f645645
Improved regex of source name sanity check
LastStarDust Nov 14, 2022
3a30917
Improved regex of source name sanity check
LastStarDust Nov 14, 2022
fe1ddbf
Add warning in docstring not to change the COMM_HEADER during operation
LastStarDust Nov 14, 2022
9ac6580
Removed redundant group name in regex
LastStarDust Nov 14, 2022
f7be8de
Simplify source name sanity check
LastStarDust Nov 15, 2022
6b928f2
Correctly process waveform parameters
LastStarDust Nov 15, 2022
05bb9fd
Renamed some methods
LastStarDust Nov 18, 2022
e0dc656
Pass keyworded arguments through the write method
LastStarDust Nov 18, 2022
7855466
Measuring a single point with a scope does not make much sense
LastStarDust Nov 18, 2022
98fb0d1
Implemented measure functions
LastStarDust Nov 18, 2022
600c2cf
Fixed indentation in docstrings
LastStarDust Nov 18, 2022
1227929
Fixed indentation (line too long)
LastStarDust Nov 18, 2022
78dc2e0
Implemented some display functions
LastStarDust Nov 18, 2022
87f3944
Removed unused import
LastStarDust Nov 18, 2022
81b0bc2
Removed useless line in docstring
LastStarDust Nov 21, 2022
52db6b8
Renamed some ambiguous variables and added comments
LastStarDust Nov 21, 2022
6143fe8
Increase write interval to 20ms
LastStarDust Nov 22, 2022
5bbabe5
Moved measure commands to channel subclass
Nov 26, 2022
9a2e224
Renamed chX to ch_X
Nov 26, 2022
d7bdb5a
ScopeChannel now inherits from instrument.Channel
Nov 26, 2022
c96323c
Applied suggestion from PR about new Channel implementation
Nov 26, 2022
6fc893b
Applied suggestion from PR about new Channel implementation
Nov 26, 2022
7e52a10
No need to replace whitespaces in the source string
LastStarDust Nov 29, 2022
8a3721f
Renamed _trigger_select_vals
LastStarDust Nov 29, 2022
57a25c7
Renamed display_parameter to set_display_parameter
LastStarDust Nov 29, 2022
2a75a88
Improved the _ChunkResizer docstring
LastStarDust Nov 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/api/instruments/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Instruments by manufacturer:
keithley/index
keysight/index
lakeshore/index
lecroy/index
newport/index
ni/index
oxfordinstruments/index
Expand Down
12 changes: 12 additions & 0 deletions docs/api/instruments/lecroy/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.. module:: pymeasure.instruments.lecroy

########
LeCroy
########

This section contains specific documentation on the LeCroy instruments that are implemented. If you are interested in an instrument not included, please consider :doc:`adding the instrument </dev/adding_instruments>`.

.. toctree::
:maxdepth: 2

lecroyT3DSO1204
9 changes: 9 additions & 0 deletions docs/api/instruments/lecroy/lecroyT3DSO1204.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
###############################
LeCroy T3DSO1204 Oscilloscope
###############################

.. autoclass:: pymeasure.instruments.lecroy.LeCroyT3DSO1204
:members:
:show-inheritance:
:inherited-members:
:exclude-members:
1 change: 1 addition & 0 deletions pymeasure/instruments/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from . import keithley
from . import keysight
from . import lakeshore
from . import lecroy
from . import newport
from . import ni
from . import oxfordinstruments
Expand Down
25 changes: 25 additions & 0 deletions pymeasure/instruments/lecroy/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# This file is part of the PyMeasure package.
#
# Copyright (c) 2013-2022 PyMeasure Developers
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#

from .lecroyT3DSO1204 import LeCroyT3DSO1204