From acd6cfbfab8d091aff09e15e919217e226f915ec Mon Sep 17 00:00:00 2001 From: su530201 <olivier.kaufmann@umons.ac.be> Date: Tue, 27 Jun 2023 16:00:07 +0200 Subject: [PATCH] Adds sp in rho and dev --- ohmpi/hardware_system.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index d7f51fc8..04b3dc17 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -207,14 +207,14 @@ class OhmPiHardware: @property def last_rho(self): if len(self.readings) > 1: - return np.mean(np.abs(self.readings[:, 4]) / self.readings[:, 3]) + return np.mean(np.abs(self.readings[:, 4] - self.sp) / self.readings[:, 3]) else: return np.nan @property def last_dev(self): if len(self.readings) > 1: - return 100. * np.std(self.readings[:, 2] * self.readings[:, 4] / self.readings[:, 3])/self.last_rho + return 100. * np.std(self.readings[:, 2] * (self.readings[:, 4] - self.sp) / self.readings[:, 3])/self.last_rho else: return np.nan -- GitLab