From bd959db874b0441e95bf7838589f6424a3561a81 Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Sat, 20 Jul 2024 17:50:36 -0400 Subject: move calcSparsingAndNumPoints to a separate function --- qolab/hardware/scope/sds1104x.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qolab/hardware/scope/sds1104x.py') diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index 12763ce..4ef4988 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -3,7 +3,7 @@ Created by Eugeniy E. Mikhailov 2021/11/29 """ from qolab.hardware.basic import BasicInstrument -from ._basic import ScopeSCPI +from ._basic import ScopeSCPI, calcSparsingAndNumPoints from qolab.hardware.scpi import response2numStr from qolab.data.trace import Trace, TraceXY import numpy as np @@ -112,7 +112,7 @@ class SDS1104X(ScopeSCPI): Npnts, availableNpnts, maxRequiredPoints, - ) = self.calcSparsingAndNumPoints(availableNpnts, maxRequiredPoints) + ) = calcSparsingAndNumPoints(availableNpnts, maxRequiredPoints) if decimate: Npnts = availableNpnts # get all of them and decimate later if (sparsing == 1 and Npnts == availableNpnts) or decimate: @@ -296,7 +296,7 @@ class SDS1104X(ScopeSCPI): Npnts, availableNpnts, maxRequiredPoints, - ) = self.calcSparsingAndNumPoints(availableNpnts, maxRequiredPoints) + ) = calcSparsingAndNumPoints(availableNpnts, maxRequiredPoints) sampleRate = self.getSampleRate() timePerDiv = self.getTimePerDiv() trigDelay = self.getTrigDelay() -- cgit v1.2.3