Skip to content

Commit

Permalink
fix move trigger mode setting to where it belongs
Browse files Browse the repository at this point in the history
  • Loading branch information
jana-d authored and jenshnielsen committed Mar 24, 2017
1 parent ad05a69 commit 16bc8f5
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions qcodes/instrument_drivers/ZI/ZIUHFLI.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,13 @@ def get(self):
# We add one second to account for latencies and random delays
meas_time = segs*(params['scope_duration'].get()+deadtime)+1
npts = params['scope_length'].get()

# one shot per trigger. This needs to be set every time
# a the scope is enabled as below using scope_runstop
# We should also test if scopeModule/mode and scopeModule/averager/weight
# needs to be set every time since we are creating a new scopemodule
# here
self._instrument.daq.setInt('/{}/scopes/0/single'.format(self._instrument.device), 1)
self._instrument.daq.sync()
# Create a new scopeModule instance (TODO: Why a new instance?)
scope = self._instrument.daq.scopeModule()

Expand All @@ -390,13 +396,7 @@ def get(self):
params['scope_runstop'].set('run')

log.info('[*] Starting ZI scope acquisition.')
# one shot per trigger. This needs to be set every time
# a the scope is enabled as below using scope_runstop
# We should also test if scopeModule/mode and scopeModule/averager/weight
# needs to be set every time since we are creating a new scopemodule
# here
self._instrument.daq.setInt('/{}/scopes/0/single'.format(self._instrument.device), 1)
self._instrument.daq.sync()

# Start something... hauling data from the scopeModule?
scope.execute()

Expand Down

0 comments on commit 16bc8f5

Please sign in to comment.