aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-26 11:17:11 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-26 11:17:11 -0400
commit93e7ab5101b821abd5596095e5601cdfdd16a0d1 (patch)
tree57a5e44e2cd58da9decfff715489fad221fce4ee /qolab/hardware
parente0fb8e1ab81a7ab22d9f18dcda0590ee96102287 (diff)
downloadqolab-93e7ab5101b821abd5596095e5601cdfdd16a0d1.tar.gz
qolab-93e7ab5101b821abd5596095e5601cdfdd16a0d1.zip
remove duplicate code of getTimeTrace from Siglent
Diffstat (limited to 'qolab/hardware')
-rw-r--r--qolab/hardware/scope/sds1104x.py22
1 files changed, 0 insertions, 22 deletions
diff --git a/qolab/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py
index 82d85d0..d441df4 100644
--- a/qolab/hardware/scope/sds1104x.py
+++ b/qolab/hardware/scope/sds1104x.py
@@ -324,28 +324,6 @@ class SDS1104X(ScopeSCPI):
# we expect NORM, AUTO, SINGLE, STOP
self.write(f"TRIG_MODE {val}")
- def getTrace(
- self, chNum, availableNpnts=None, maxRequiredPoints=None, decimate=True
- ):
- old_trg_mode = self.getTriggerMode()
- self.setTriggerMode("STOP")
- # to get synchronous channels
- wfVoltage, rawChanCfg = self.getWaveform(
- chNum,
- availableNpnts=availableNpnts,
- maxRequiredPoints=maxRequiredPoints,
- decimate=decimate,
- )
- t = self.getTimeTrace(rawChanCfg)
- tr = TraceXY(f"Ch{chNum}")
- tr.x = t
- tr.y = wfVoltage
- # restore scope to the before acquisition mode
- if old_trg_mode != "STOP":
- # short speed up here with this check
- self.setTriggerMode(old_trg_mode)
- return tr
-
if __name__ == "__main__":
import pyvisa