From fd7eeb74b23ed6c80d60389c2cd164d77ba4da18 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 10 Oct 2023 17:11:23 +0200
Subject: [PATCH] Uses self._hw values for R and dev
---
dev/test_mb_2024_0_mux_2024.py | 2 +-
ohmpi/hardware_system.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev/test_mb_2024_0_mux_2024.py b/dev/test_mb_2024_0_mux_2024.py
index e882cb99..0a58c7af 100644
--- a/dev/test_mb_2024_0_mux_2024.py
+++ b/dev/test_mb_2024_0_mux_2024.py
@@ -79,7 +79,7 @@ if within_ohmpi:
d = k.run_measurement([A, B, M, N], injection_duration=1., nb_stack=2, duty_cycle=0.5)
print(d)
#k._hw._plot_readings()
- print(f'OhmPiHardware: Resistance: {k._hw.last_rho :.2f} ohm, dev. {k._hw.last_dev:.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV')
+ print(f'OhmPiHardware: Resistance: {k._hw.last_resistance() :.2f} ohm, dev. {k._hw.last_dev():.2f} %, sp: {k._hw.sp:.2f} mV, rx bias: {k._hw.rx._bias:.2f} mV')
print(f'OhmPi: Resistance: {d["R [ohm]"] :.2f} ohm, dev. {d["R_std [%]"]:.2f} %, rx bias: {k._hw.rx._bias:.2f} mV')
k._hw._plot_readings(save_fig=False)
# plot_exec_log('ohmpi/logs/exec.log')
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 3e27eab8..6ca62794 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -260,7 +260,6 @@ class OhmPiHardware:
self._pulse += 1
self.exec_logger.event(f'OhmPiHardware\tread_values\tend\t{datetime.datetime.utcnow()}')
- @property
def last_resistance(self, delay=0.):
v = np.where((self.readings[:, 0] >= delay) & (self.readings[:, 2] != 0))[0]
if len(v) > 1:
@@ -269,7 +268,6 @@ class OhmPiHardware:
else:
return np.nan
- @property
def last_dev(self, delay=0.):
v = np.where((self.readings[:, 0] >= delay) & (self.readings[:, 2] != 0))
if len(v) > 1:
--
GitLab