diff options
Diffstat (limited to 'qolab/hardware/scope/sds1104x.py')
| -rw-r--r-- | qolab/hardware/scope/sds1104x.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py index 6c7116c..afc68bb 100644 --- a/qolab/hardware/scope/sds1104x.py +++ b/qolab/hardware/scope/sds1104x.py @@ -13,6 +13,7 @@ class SDS1104X(ScopeSCPI): horizDivOnScreen = 14 def __init__(self, resource): super().__init__(resource) + self.config['Device model'] = 'SDS1104X' self.resource.read_termination='\n' self.numberOfChannels = 4 self.maxRequiredPoints = 1000; # desired number of points per channel, can return twice more @@ -138,9 +139,9 @@ class SDS1104X(ScopeSCPI): VoltsPerDiv = self.getChanVoltsPerDiv(chNum) tr = trRaw tr.values = trRaw.values * VoltsPerDiv * self.vertDivOnScreen/250 -VoltageOffset - tr.unit = 'Volt' - tr.tags['VoltageOffset'] = VoltageOffset - tr.tags['VoltsPerDiv'] = VoltsPerDiv + tr.config['unit'] = 'Volt' + tr.config['tags']['VoltageOffset'] = VoltageOffset + tr.config['tags']['VoltsPerDiv'] = VoltsPerDiv return(tr, availableNpnts) def getTimeTrace(self, availableNpnts=None, maxRequiredPoints=None): @@ -155,11 +156,11 @@ class SDS1104X(ScopeSCPI): tval = tval - timePerDiv * self.horizDivOnScreen/2 - trigDelay t = Trace('time') t.values = tval.reshape(tval.size,1) - t.unit = 'S' - t.tags['timePerDiv'] = timePerDiv - t.tags['trigDelay'] = trigDelay - t.tags['SampleRate'] = sampleRate - t.tags['sparsing'] = sparsing + t.config['unit'] = 'S' + t.config['tags']['timePerDiv'] = timePerDiv + t.config['tags']['trigDelay'] = trigDelay + t.config['tags']['SampleRate'] = sampleRate + t.config['tags']['sparsing'] = sparsing return(t) def getTrace(self, chNum, availableNpnts=None, maxRequiredPoints=None): |