Commit a12f5ab1 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Modifies the way last_dev is computed in hardware system

Showing with 3 additions and 3 deletions
+3 -3
......@@ -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
from ohmpi.ohmpi.config import HARDWARE_CONFIG
from ohmpi.config import HARDWARE_CONFIG
import time
import os
import numpy as np
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment