aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware/scope/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'qolab/hardware/scope/__init__.py')
-rw-r--r--qolab/hardware/scope/__init__.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/qolab/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py
index d4e31a8..8c022c4 100644
--- a/qolab/hardware/scope/__init__.py
+++ b/qolab/hardware/scope/__init__.py
@@ -28,13 +28,33 @@ class Scope(BasicInstrument):
def getTrace(self, chNum, availableNpnts=None, maxRequiredPoints=None, decimate=True):
# Should work with minimal arguments list
# but might be faster if parameters provided: less IO requests
+ # old_trg_mode = self.getTriggerMode()
+ # self.setTriggerMode('STOP'); # to get synchronous channels
warnings.warn( 'this function is not implemented' )
+ # if old_trg_mode != "STOP":
+ # short speed up here with this check
+ # self.setTriggerMode(old_trg_mode)
+
+ def getTriggerMode(self):
+ # we expect NORM, AUTO, SINGLE, STOP
+ warnings.warn( 'this function is not implemented' )
+
+ def setTriggerMode(self, mode):
+ # we expect NORM, AUTO, SINGLE, STOP
+ warnings.warn( 'this function is not implemented' )
+
def getAllTraces(self, availableNpnts=None, maxRequiredPoints=None, decimate=True):
allTraces=TraceSetSameX('scope traces')
allTraces.config['tags']['DAQ']=self.getConfig()
+ old_trg_mode = self.getTriggerMode()
+ self.setTriggerMode('STOP'); # to get synchronous channels
for chNum in range(1, self.numberOfChannels+1):
allTraces.addTrace( self.getTrace(chNum, availableNpnts=availableNpnts, maxRequiredPoints=maxRequiredPoints, decimate=decimate) )
+ # 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( allTraces )
def plot(self, **kwargs):