diff options
Diffstat (limited to 'qolab/hardware/scope/sds1104x.py')
| -rw-r--r-- | qolab/hardware/scope/sds1104x.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index 4ef4988..af63609 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -62,21 +62,6 @@ class SDS1104X(ScopeSCPI): # it is not possible to do with this model directly pass - def calcSparsingAndNumPoints(self, availableNpnts=None, maxRequiredPoints=None): - if availableNpnts is None: - # using channel 1 to get availableNpnts - availableNpnts = self.getAvailableNumberOfPoints(1) - if maxRequiredPoints is None: - maxRequiredPoints = self.maxRequiredPoints - - if availableNpnts <= maxRequiredPoints * 2: - Npnts = availableNpnts - sparsing = 1 - else: - sparsing = int(np.floor(availableNpnts / maxRequiredPoints)) - Npnts = int(np.floor(availableNpnts / sparsing)) - return (sparsing, Npnts, availableNpnts, maxRequiredPoints) - def getRawWaveform( self, chNum, availableNpnts=None, maxRequiredPoints=None, decimate=True ): @@ -107,6 +92,9 @@ class SDS1104X(ScopeSCPI): to use ``decimate=True``. """ + if availableNpnts is None: + # using channel 1 to get availableNpnts + availableNpnts = self.getAvailableNumberOfPoints(1) ( sparsing, Npnts, @@ -291,6 +279,9 @@ class SDS1104X(ScopeSCPI): return (tr, availableNpnts) def getTimeTrace(self, availableNpnts=None, maxRequiredPoints=None): + if availableNpnts is None: + # using channel 1 to get availableNpnts + availableNpnts = self.getAvailableNumberOfPoints(1) ( sparsing, Npnts, |