diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index d7f51fc817860c9747c2ca137a649d460d48f360..04b3dc17de4df8c79a4f25a12f717949c236cc0e 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