aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qolab/hardware/scope/sds1104x.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py
index fb53cb9..c730cb7 100644
--- a/qolab/hardware/scope/sds1104x.py
+++ b/qolab/hardware/scope/sds1104x.py
@@ -177,7 +177,7 @@ class SDS1104X(ScopeSCPI):
trRaw.config["unit"] = "Count"
trRaw.config["tags"]["Decimate"] = decimate
trRaw.config["tags"]["rawChanConfig"] = rawChanCfg
- return (trRaw, rawChanCfg)
+ return trRaw
def getChanVoltsPerDiv(self, chNum):
qstr = f"C{chNum}:VDIV?"
@@ -274,7 +274,7 @@ class SDS1104X(ScopeSCPI):
In short decimate=True is slower but more precise.
"""
- trRaw, rawChanCfg = self.getRawWaveform(
+ trRaw = self.getRawWaveform(
chNum,
availableNpnts=availableNpnts,
maxRequiredPoints=maxRequiredPoints,
@@ -289,7 +289,7 @@ class SDS1104X(ScopeSCPI):
tr.config["unit"] = "Volt"
tr.config["tags"]["VoltageOffset"] = VoltageOffset
tr.config["tags"]["VoltsPerDiv"] = VoltsPerDiv
- return (tr, rawChanCfg)
+ return tr
def getTimeTrace(self, rawChanCfg):
availableNpnts = rawChanCfg["availableNpnts"]