aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2021-12-05 12:13:25 -0500
committerEugeniy E. Mikhailov <evgmik@gmail.com>2021-12-05 12:13:25 -0500
commitac5cf2a7df5c75f631fe6f66e5d99d4eac0781cc (patch)
tree844b82ca3431b4128ffaf9b40ff3d80b5d9b17c7 /qolab/hardware
parent31002b93370b7946ddf4cfc44b7d33a974945793 (diff)
downloadpyExpControl-ac5cf2a7df5c75f631fe6f66e5d99d4eac0781cc.tar.gz
pyExpControl-ac5cf2a7df5c75f631fe6f66e5d99d4eac0781cc.zip
attributes -> tags
Diffstat (limited to 'qolab/hardware')
-rw-r--r--qolab/hardware/scope/sds1104x.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py
index 57323e1..d5b109d 100644
--- a/qolab/hardware/scope/sds1104x.py
+++ b/qolab/hardware/scope/sds1104x.py
@@ -128,8 +128,8 @@ class SDS1104X(ScopeSCPI):
VoltsPerDiv = self.getChanVoltsPerDiv(chNum)
tr = trRaw
tr.values = trRaw.values * VoltsPerDiv * self.vertDivOnScreen/250 -VoltageOffset
- tr.attributes['VoltageOffset'] = VoltageOffset
- tr.attributes['VoltsPerDiv'] = VoltsPerDiv
+ tr.tags['VoltageOffset'] = VoltageOffset
+ tr.tags['VoltsPerDiv'] = VoltsPerDiv
return(tr, availableNpnts)
def getTimeTrace(self, availableNpnts=None, maxRequiredPoints=None):
@@ -145,10 +145,10 @@ class SDS1104X(ScopeSCPI):
t = Trace('time')
t.values = tval
t.unit = 'S'
- t.attributes['timePerDiv'] = timePerDiv
- t.attributes['trigDelay'] = trigDelay
- t.attributes['SampleRate'] = sampleRate
- t.attributes['sparsing'] = sparsing
+ t.tags['timePerDiv'] = timePerDiv
+ t.tags['trigDelay'] = trigDelay
+ t.tags['SampleRate'] = sampleRate
+ t.tags['sparsing'] = sparsing
return(t)
def getTrace(self, chNum, availableNpnts=None, maxRequiredPoints=None):