From 185bf7bc88376497c979035690d10e8dd5df2083 Mon Sep 17 00:00:00 2001 From: l_samenv Date: Thu, 18 Mar 2021 14:01:28 +0100 Subject: [PATCH] improved softcal + removed debug code from ls370 --- secop_psi/ls370res.py | 2 +- secop_psi/softcal.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/secop_psi/ls370res.py b/secop_psi/ls370res.py index 279cc04..0b73e9f 100644 --- a/secop_psi/ls370res.py +++ b/secop_psi/ls370res.py @@ -228,7 +228,7 @@ class ResChannel(HasIodev, Readable): if autorange: result['autorange'] = 'hard' # else: do not change autorange - self.log.info('%s range %r %r %r' % (self.name, rng, autorange, self.autorange)) + # self.log.info('%s range %r %r %r' % (self.name, rng, autorange, self.autorange)) if excoff: result.update(iexc=0, vexc=0) elif iscur: diff --git a/secop_psi/softcal.py b/secop_psi/softcal.py index bfa06a1..927da18 100644 --- a/secop_psi/softcal.py +++ b/secop_psi/softcal.py @@ -181,13 +181,16 @@ class Sensor(Readable): pollerClass = None _value_error = None - def __init__(self, name, logger, cfgdict, srv): - cfgdict.setdefault('description', 'calibrated value of module %r' % cfgdict['rawsensor']) - super().__init__(name, logger, cfgdict, srv) + def checkProperties(self): + if 'description' not in self.propertyValues: + self.description = '_' # avoid complaining about missing description + super().checkProperties() 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)