diff options
| author | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-01-03 09:56:06 -0500 |
|---|---|---|
| committer | Eugeniy E. Mikhailov <evgmik@gmail.com> | 2022-01-03 09:56:06 -0500 |
| commit | a6b773f7d57359be7f34cc89a094be53ef12f890 (patch) | |
| tree | 64768f3b8436299e7b2b03c66591e8771bb1227e /qolab | |
| parent | e3243a8b7cfe656683f1f3a2b97c560e5a23d9e6 (diff) | |
| parent | baf8977d499dc40ab89fb94b0784134945240708 (diff) | |
| download | qolab-a6b773f7d57359be7f34cc89a094be53ef12f890.tar.gz qolab-a6b773f7d57359be7f34cc89a094be53ef12f890.zip | |
Merge branch 'master' of qo.physics.wm.edu:pyExpControl
Diffstat (limited to 'qolab')
| -rw-r--r-- | qolab/hardware/scope/sds1104x.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index c950046..aa5940f 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -113,11 +113,11 @@ class SDS1104X(ScopeSCPI): trRaw.values = wfRaw.reshape(wfRaw.size,1) if decimate and sparsing != 1: numtaps = 3; # not sure it is the best case - trRaw.values = scipy.signal.decimate(trRaw.values, sparsing, 3, axis=0) + trRaw.values = scipy.signal.decimate(trRaw.values, sparsing, numtaps, axis=0) except ValueError as err: # most likely we get crazy number of points # self.read() # flushing the bogus output of previous command - print(f'Error: getting waveform failed for {qstr=}') + print(f'Error {err=}: getting waveform failed for {qstr=}') wfRaw=np.array([]) trRaw.config['unit'] = 'Count' trRaw.config['tags']['Decimate'] = decimate |