From 134ba20d464b433603a33ddc8bd4e3749975605d Mon Sep 17 00:00:00 2001 From: su530201 <olivier.kaufmann@umons.ac.be> Date: Tue, 20 Jun 2023 18:03:46 +0200 Subject: [PATCH] Add last_rho and last_std methods --- ohmpi/hardware_system.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index a6c78cc6..c7d45d44 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -196,6 +196,18 @@ class OhmPiHardware: self._pulse += 1 self.exec_logger.event(f'OhmPiHardware\tread_values\tend\t{datetime.datetime.utcnow()}') + def last_rho(self): + if len(self.readings) > 1: + return np.mean(self.readings[:, 2] * self.readings[:, 4] / self.readings[:, 3]) + else: + return np.nan + + 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() + else: + return np.nan + @property def sp(self): # TODO: use a time window within pulses if self.readings.shape == (0,) or len(self.readings[self.readings[:, 2] == 1, :]) < 1 or \ -- GitLab