result from merge with gerrit

drivers in secop_psi

Change-Id: I7fd8312b11f365b423e66b2417b9e54ec6558a11

secop_psi/softcal.py

@@ -22,12 +22,12 @@
 
 import math
 import os
-from os.path import basename, dirname, exists, join
+from os.path import basename, exists, join
 
 import numpy as np
 from scipy.interpolate import splev, splrep  # pylint: disable=import-error
 
-from secop.core import Attached, BoolType, Parameter, Readable, StringType, FloatRange
+from secop.core import Attached, BoolType, Parameter, Readable, StringType
 
 
 def linear(x):
@@ -74,18 +74,13 @@ class Parser340(StdParser):
     def parse(self, line):
         """scan header for data format"""
         if self.header:
-            key, _, value = line.partition(':')
-            if value:  # this is a header line, as it contains ':'
-                value = value.split()[0]
-                key = ''.join(key.split()).lower()
-                if key == 'dataformat':
-                    if value == '4':
-                        self.logx, self.logy = True, False  # logOhm
-                    elif value == '5':
-                        self.logx, self.logy = True, True  # logOhm, logK
-                    elif value not in ('1', '2', '3'):
-                        raise ValueError('invalid Data Format')
-            elif 'No.' in line:
+            if line.startswith("Data Format"):
+                dataformat = line.split(":")[1].strip()[0]
+                if dataformat == '4':
+                    self.logx, self.logy = True, False  # logOhm
+                elif dataformat == '5':
+                    self.logx, self.logy = True, True  # logOhm, logK
+            elif line.startswith("No."):
                 self.header = False
             return
         super().parse(line)
@@ -109,9 +104,7 @@ class CalCurve:
         calibname = sensopt.pop(0)
         _, dot, ext = basename(calibname).rpartition('.')
         kind = None
-        pathlist = os.environ.get('FRAPPY_CALIB_PATH', '').split(',')
-        pathlist.append(join(dirname(__file__), 'calcurves'))
-        for path in pathlist:
+        for path in os.environ.get('FRAPPY_CALIB_PATH', '').split(','):
             # first try without adding kind
             filename = join(path.strip(), calibname)
             if exists(filename):
@@ -141,26 +134,13 @@ class CalCurve:
         cls, args = KINDS.get(kind, (StdParser, {}))
         args.update(optargs)
 
-        try:
-            parser = cls(**args)
-            with open(filename) as f:
-                for line in f:
-                    parser.parse(line)
-        except Exception as e:
-            raise ValueError('calib curve %s: %s' % (calibspec, e))
+        parser = cls(**args)
+        with open(filename) as f:
+            for line in f:
+                parser.parse(line)
         self.convert_x = nplog if parser.logx else linear
         self.convert_y = npexp if parser.logy else linear
-        x = np.asarray(parser.xdata)
-        y = np.asarray(parser.ydata)
-        if np.all(x[:-1] > x[1:]):  # all decreasing
-            x = np.flip(x)
-            y = np.flip(y)
-        elif np.any(x[:-1] >= x[1:]):  # some not increasing
-            raise ValueError('calib curve %s is not monotonic' % calibspec)
-        try:
-            self.spline = splrep(x, y, s=0, k=min(3, len(x) - 1))
-        except (ValueError, TypeError):
-            raise ValueError('invalid calib curve %s' % calibspec)
+        self.spline = splrep(np.asarray(parser.xdata), np.asarray(parser.ydata), s=0)
 
     def __call__(self, value):
         """convert value
@@ -176,23 +156,17 @@ class Sensor(Readable):
 
     calib = Parameter('calibration name', datatype=StringType(), readonly=False)
     abs = Parameter('True: take abs(raw) before calib', datatype=BoolType(), readonly=False, default=True)
-    value = Parameter(datatype=FloatRange(unit='K'))
+    value = Parameter(unit='K')
     pollinterval = Parameter(export=False)
     status = Parameter(default=(Readable.Status.ERROR, 'unintialized'))
 
-    pollerClass = None
+    description = 'a calibrated sensor value'
     _value_error = None
-
-    def checkProperties(self):
-        if 'description' not in self.propertyValues:
-            self.description = '_'  # avoid complaining about missing description
-        super().checkProperties()
+    enablePoll = False
 
     def initModule(self):
         self._rawsensor.registerCallbacks(self, ['status'])  # auto update status
         self._calib = CalCurve(self.calib)
-        if self.description == '_':
-            self.description = '%r calibrated with curve %r' % (self.rawsensor, self.calib)
 
     def write_calib(self, value):
         self._calib = CalCurve(value)
@@ -200,7 +174,7 @@ class Sensor(Readable):
 
     def update_value(self, value):
         if self.abs:
-            value = abs(float(value))
+            value = abs(value)
         self.value = self._calib(value)
         self._value_error = None