Commit 8956156e authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Handle duty_cycle argument within ohmpi run_measurement

Showing with 2 additions and 2 deletions
+2 -2
...@@ -207,7 +207,7 @@ class OhmPiHardware: ...@@ -207,7 +207,7 @@ class OhmPiHardware:
v = self.readings[:, 2] != 0 v = self.readings[:, 2] != 0
if len(v) > 1: if len(v) > 1:
# return np.mean(np.abs(self.readings[v, 4] - self.sp) / self.readings[v, 3]) # return np.mean(np.abs(self.readings[v, 4] - self.sp) / self.readings[v, 3])
return np.mean((self.readings[v, 2] * self.readings[v, 4] - self.sp) / self.readings[v, 3]) return np.mean(self.readings[v, 2] * (self.readings[v, 4] - self.sp) / self.readings[v, 3])
else: else:
return np.nan return np.nan
......
...@@ -453,7 +453,7 @@ class OhmPi(object): ...@@ -453,7 +453,7 @@ class OhmPi(object):
tx_volt = float(tx_volt) tx_volt = float(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):
self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2, cycles=nb_stack) self._hw.vab_square_wave(tx_volt, cycle_duration=injection_duration*2, cycles=nb_stack, duty_cycle=kwargs.pop('duty_cycle', 1.))
if 'delay' in kwargs.keys(): if 'delay' in kwargs.keys():
delay = kwargs['delay'] delay = kwargs['delay']
else: else:
......
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