From 93e7ab5101b821abd5596095e5601cdfdd16a0d1 Mon Sep 17 00:00:00 2001 From: "Eugeniy E. Mikhailov" Date: Fri, 26 Jul 2024 11:17:11 -0400 Subject: remove duplicate code of getTimeTrace from Siglent --- qolab/hardware/scope/sds1104x.py | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'qolab/hardware/scope') 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 -- cgit v1.2.3