From a12f5ab1f82a5993dab0f029e90f1c65bfb372fe Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Fri, 22 Sep 2023 22:43:08 +0200
Subject: [PATCH] Modifies the way last_dev is computed in hardware system
---
ohmpi/hardware_components/dummy_ctl.py | 2 +-
ohmpi/hardware_components/dummy_tx.py | 2 +-
ohmpi/hardware_system.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ohmpi/hardware_components/dummy_ctl.py b/ohmpi/hardware_components/dummy_ctl.py
index 0e16923f..b9cedf8f 100644
--- a/ohmpi/hardware_components/dummy_ctl.py
+++ b/ohmpi/hardware_components/dummy_ctl.py
@@ -8,4 +8,4 @@ class Ctl(CtlAbstract):
def __init__(self, **kwargs):
kwargs.update({'board_name': os.path.basename(__file__).rstrip('.py')})
super().__init__(**kwargs)
- self.bus = None
+ self.connections = None
diff --git a/ohmpi/hardware_components/dummy_tx.py b/ohmpi/hardware_components/dummy_tx.py
index 68bb4129..067c1465 100644
--- a/ohmpi/hardware_components/dummy_tx.py
+++ b/ohmpi/hardware_components/dummy_tx.py
@@ -1,4 +1,4 @@
-from ohmpi.ohmpi.config import HARDWARE_CONFIG
+from ohmpi.config import HARDWARE_CONFIG
import time
import os
import numpy as np
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index b2058748..f7934e54 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -215,7 +215,7 @@ class OhmPiHardware:
def last_dev(self):
if len(self.readings) > 1:
v = self.readings[:, 2] != 0 # exclude sample where the is no injection
- return 100. * np.std(self.readings[v, 2] * self.readings[v, 4] / self.readings[v, 3]) / self.last_rho
+ return 100. * np.std(self.readings[v, 2] * (self.readings[v, 4] - self.sp) / self.readings[v, 3]) / self.last_rho
else:
return np.nan
--
GitLab