Commit 8fc556dc authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Updates a test in dev for 2 muxes 2024

Showing with 7 additions and 2 deletions
+7 -2
...@@ -213,7 +213,7 @@ class OhmPiHardware: ...@@ -213,7 +213,7 @@ class OhmPiHardware:
@property @property
def last_dev(self): def last_dev(self):
if len(self.readings) > 1: if len(self.readings) > 1:
v = self.readings[:,2] != 0 v = self.readings[:, 2] != 0 # exclude sample where the is no injection
return 100. * np.std(self.readings[v, 2] * (self.readings[v, 4] - self.sp) / self.readings[v, 3])/self.last_rho return 100. * np.std(self.readings[v, 2] * (self.readings[v, 4] - self.sp) / self.readings[v, 3])/self.last_rho
else: else:
return np.nan return np.nan
......
...@@ -454,6 +454,11 @@ class OhmPi(object): ...@@ -454,6 +454,11 @@ class OhmPi(object):
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)
if 'delay' in kwargs.keys():
delay = kwargs['delay']
else:
delay = 0.
x = np.where(self._hw.readings[:, 0] >= delay)
d = { d = {
"time": datetime.now().isoformat(), "time": datetime.now().isoformat(),
"A": quad[0], "A": quad[0],
...@@ -463,7 +468,7 @@ class OhmPi(object): ...@@ -463,7 +468,7 @@ class OhmPi(object):
"inj time [ms]": injection_duration, # NOTE: check this "inj time [ms]": injection_duration, # NOTE: check this
# "Vmn [mV]": sum_vmn / (2 * nb_stack), # "Vmn [mV]": sum_vmn / (2 * nb_stack),
# "I [mA]": sum_i / (2 * nb_stack), # "I [mA]": sum_i / (2 * nb_stack),
"R [ohm]": np.mean(self._hw.readings[:, 2]*self._hw.readings[:, 4])/np.median(self._hw.readings[:, 3]), "R [ohm]": np.mean(self._hw.readings[x, 2]*self._hw.readings[x, 4])/np.median(self._hw.readings[x, 3]),
"Ps [mV]": self._hw.sp, "Ps [mV]": self._hw.sp,
"nbStack": nb_stack, "nbStack": nb_stack,
"Tx [V]": tx_volt, "Tx [V]": tx_volt,
......
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