aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware/scope/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'qolab/hardware/scope/__init__.py')
-rw-r--r--qolab/hardware/scope/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/qolab/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py
index e05645f..8face45 100644
--- a/qolab/hardware/scope/__init__.py
+++ b/qolab/hardware/scope/__init__.py
@@ -3,6 +3,7 @@ Provide basic class to operate scope
Created by Eugeniy E. Mikhailov 2021/11/29
"""
from qolab.hardware.scpi import SCPIinstr
+from qolab.data.trace import TraceSetSameX
class Scope:
@@ -16,9 +17,9 @@ class Scope:
warnings.warn( 'this function is not implemented' )
def getAllTraces(self, availableNpnts=None, maxRequiredPoints=None):
- allTraces={}
+ allTraces=TraceSetSameX('scope traces')
for chNum in range(1, self.numberOfChannels+1):
- allTraces[chNum] = self.getTrace(chNum, availableNpnts, maxRequiredPoints)
+ allTraces.addTrace( self.getTrace(chNum, availableNpnts, maxRequiredPoints) )
return( allTraces )