diff options
Diffstat (limited to 'qolab/hardware/scope')
| -rw-r--r-- | qolab/hardware/scope/_basic.py | 1 | ||||
| -rw-r--r-- | qolab/hardware/scope/rigolds1054z.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/qolab/hardware/scope/_basic.py b/qolab/hardware/scope/_basic.py index afc2913..914f009 100644 --- a/qolab/hardware/scope/_basic.py +++ b/qolab/hardware/scope/_basic.py @@ -137,6 +137,7 @@ class Scope(BasicInstrument): old_run_status = self.getRun() if old_run_status: # avoid unnecessary status change self.setRun(False) # stop if currently running + self._waitUntillStop() # to get synchronous channels for chNum in range(1, self.numberOfChannels + 1): allTraces.addTrace( diff --git a/qolab/hardware/scope/rigolds1054z.py b/qolab/hardware/scope/rigolds1054z.py index 1d4e6c9..bcd351d 100644 --- a/qolab/hardware/scope/rigolds1054z.py +++ b/qolab/hardware/scope/rigolds1054z.py @@ -427,6 +427,7 @@ class RigolDS1054z(ScopeSCPI): old_run_status = self.getRun() if old_run_status: # avoid unnecessary status change self.setRun(False) # stop if currently running + self._waitUntillStop() # to get synchronous channels wfVoltage, rawChanCfg = self.getWaveform( chNum, |