Changes the way R and R_std are computed taking sp into account

e010b4e8 · Olivier Kaufmann · 9f324b55 · e010b4e8
Commit e010b4e8 authored 1 year ago by Olivier Kaufmann
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -459,8 +459,8 @@ class OhmPi(object):
            else:
                delay = 0.
            x = np.where((self._hw.readings[:, 0] >= delay) & (self._hw.readings[:, 2] != 0))
-            R = np.mean(self._hw.readings[x, 2]*self._hw.readings[x, 4])/np.median(self._hw.readings[x, 3])
+            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
+            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 = {
                "time": datetime.now().isoformat(),
                "A": quad[0],