Commit 47f1f908 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Fixes bug in _compute_tx_volt

Showing with 2 additions and 2 deletions
+2 -2
......@@ -495,7 +495,7 @@ class OhmPiHardware:
injection.join()
v = np.where((self.readings[:, 0] > delay) & (self.readings[:, 2] != 0))[0] # NOTE : discard data aquired in the first x ms
iab = self.readings[v, 3]
vmn = self.readings[v, 4] * self.readings[v, 2]
vmn = self.readings[v, 4]/1000. * self.readings[v, 2]
iab_mean = np.mean(iab)
iab_std = np.std(iab)
vmn_mean = np.mean(vmn)
......
......@@ -491,7 +491,7 @@ class OhmPi(object):
# tx_volt = float(kwargs.pop('tx_volt', self.settings['tx_volt']))
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):
# tx_volt,_ ,_ = self._hw._compute_tx_volt(tx_volt=tx_volt, strategy=strategy)
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)
if 'delay' in kwargs.keys():
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