Commit 75e3cda0 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Adds compute_tx_volt in run_measurement

Showing with 2 additions and 0 deletions
+2 -0
...@@ -602,6 +602,7 @@ class OhmPiHardware: ...@@ -602,6 +602,7 @@ class OhmPiHardware:
# if self.tx.pwr.pwr_state == 'off': # if self.tx.pwr.pwr_state == 'off':
# self.tx.pwr.pwr_state = 'on' # self.tx.pwr.pwr_state = 'on'
# switch_pwr_off = True # switch_pwr_off = True
self._gain_auto(vab=vab) self._gain_auto(vab=vab)
assert 0. <= duty_cycle <= 1. assert 0. <= duty_cycle <= 1.
if duty_cycle < 1.: if duty_cycle < 1.:
......
...@@ -491,6 +491,7 @@ class OhmPi(object): ...@@ -491,6 +491,7 @@ class OhmPi(object):
# tx_volt = float(kwargs.pop('tx_volt', self.settings['tx_volt'])) # tx_volt = float(kwargs.pop('tx_volt', self.settings['tx_volt']))
bypass_check = kwargs['bypass_check'] if 'bypass_check' in kwargs.keys() else False bypass_check = kwargs['bypass_check'] if 'bypass_check' in kwargs.keys() else False
if self.switch_mux_on(quad, bypass_check=bypass_check, cmd_id=cmd_id): if self.switch_mux_on(quad, bypass_check=bypass_check, cmd_id=cmd_id):
tx_volt = self._hw._compute_tx_volt(tx_volt=tx_volt, strategy=strategy)
self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, duty_cycle=duty_cycle) self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2/duty_cycle, cycles=nb_stack, duty_cycle=duty_cycle)
if 'delay' in kwargs.keys(): if 'delay' in kwargs.keys():
delay = kwargs['delay'] delay = kwargs['delay']
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment