From 62922398dcc67b1ef02d5bed89a39dfb9cde26bb Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Sun, 2 Jan 2022 23:59:00 -0500 Subject: get rid of magic number --- qolab/hardware/scope/sds1104x.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qolab/hardware/scope/sds1104x.py') diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index c950046..e0653d9 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -113,7 +113,7 @@ 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 -- cgit v1.2.3 From baf8977d499dc40ab89fb94b0784134945240708 Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Sun, 2 Jan 2022 23:59:29 -0500 Subject: use err in output --- qolab/hardware/scope/sds1104x.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qolab/hardware/scope/sds1104x.py') diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index e0653d9..aa5940f 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -117,7 +117,7 @@ class SDS1104X(ScopeSCPI): 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 -- cgit v1.2.3