From a7591ddad2ac21f7c30bafa8802452e20882003f Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 12 Sep 2023 10:17:20 +0200
Subject: [PATCH] Updates the way last_rho is computed in OhmPiHardware
---
ohmpi/hardware_system.py | 3 ++-
ohmpi/ohmpi.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index e2316410..45b25ea3 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -206,7 +206,8 @@ class OhmPiHardware:
def last_rho(self):
v = self.readings[:, 2] != 0
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])
else:
return np.nan
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index 9e9712aa..b12b8dc1 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -459,6 +459,7 @@ class OhmPi(object):
else:
delay = 0.
x = np.where((self._hw.readings[:, 0] >= delay) & (self._hw.readings[:, 2] != 0))
+ print(f'length of series: {len(x)}')
R = np.mean((self._hw.readings[x, 2] * self._hw.readings[x, 4] - self._hw.sp) / self._hw.readings[x, 3])
R_std = 100. * np.std((self._hw.readings[x, 2] * self._hw.readings[x, 4] - self._hw.sp) / self._hw.readings[x, 3]) / R
d = {
--
GitLab