migrated secop_psi drivers to new syntax

- includes all changes up to 'fix inheritance order' from git_mlz
  6a32ecf342

Change-Id: Ie3ceee3dbd0a9284b47b1d5b5dbe262eebe8f283

secop_psi/softcal.py

@@ -20,13 +20,14 @@
 # *****************************************************************************
 """Software calibration"""
 
-import os
-from os.path import join, exists, basename
 import math
-import numpy as np
-from scipy.interpolate import splrep, splev  # pylint: disable=import-error
+import os
+from os.path import basename, exists, join
 
-from secop.core import Readable, Parameter, Override, Attached, StringType, BoolType
+import numpy as np
+from scipy.interpolate import splev, splrep  # pylint: disable=import-error
+
+from secop.core import Attached, BoolType, Parameter, Readable, StringType
 
 
 def linear(x):
@@ -102,6 +103,7 @@ class CalCurve:
         sensopt = calibspec.split(',')
         calibname = sensopt.pop(0)
         _, dot, ext = basename(calibname).rpartition('.')
+        kind = None
         for path in os.environ.get('FRAPPY_CALIB_PATH', '').split(','):
             # first try without adding kind
             filename = join(path.strip(), calibname)
@@ -109,8 +111,8 @@ class CalCurve:
                 kind = ext if dot else None
                 break
             # then try adding all kinds as extension
-            for kind in KINDS:
-                for nam in {calibname, calibname.upper(), calibname.lower()}:
+            for nam in calibname, calibname.upper(), calibname.lower():
+                for kind in KINDS:
                     filename = join(path.strip(), '%s.%s' % (nam, kind))
                     if exists(filename):
                         break
@@ -150,16 +152,14 @@ class CalCurve:
 
 
 class Sensor(Readable):
-    properties = {
-        'rawsensor': Attached(),
-    }
-    parameters = {
-        'calib': Parameter('calibration name', datatype=StringType(), readonly=False),
-        'abs': Parameter('True: take abs(raw) before calib', datatype=BoolType(), readonly=False, default=True),
-        'value': Override(unit='K'),
-        'pollinterval': Override(export=False),
-        'status': Override(default=(Readable.Status.ERROR, 'unintialized'))
-    }
+    rawsensor = Attached()
+
+    calib = Parameter('calibration name', datatype=StringType(), readonly=False)
+    abs = Parameter('True: take abs(raw) before calib', datatype=BoolType(), readonly=False, default=True)
+    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
@@ -179,7 +179,7 @@ class Sensor(Readable):
         self._value_error = None
 
     def error_update_value(self, err):
-        if self.abs and str(err) == 'R_UNDER':
+        if self.abs and str(err) == 'R_UNDER':  # hack: ignore R_UNDER from ls370
             self._value_error = None
             return None
         self._value_error = repr(err)