linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set unit together with datatype

Browse Source 
Change-Id: I412471880e71792160ee56a79375dc62dd4aaafc
This commit is contained in:
zolliker
2021-10-06 09:07:09 +02:00
parent 21dfcbd290
commit 09056ea87e
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
secop_psi/dpm.py
View File

@ -56,8 +56,8 @@ class DPM3(HasIodev, Drivable):
motor = Attached() motor = Attached()
digits = Parameter('number of digits for value', IntRange(0, 5), initwrite=True, readonly=False) digits = Parameter('number of digits for value', IntRange(0, 5), initwrite=True, readonly=False)
value = Parameter(unit='N') value = Parameter(datatype=FloatRange(unit='N'))
target = Parameter(unit='N') target = Parameter(datatype=FloatRange(unit='N'))
step = Parameter('maximum motor step', FloatRange(unit='deg'), default=5, readonly=False) step = Parameter('maximum motor step', FloatRange(unit='deg'), default=5, readonly=False)
offset = Parameter('', FloatRange(-1e5, 1e5), readonly=False, poll=True) offset = Parameter('', FloatRange(-1e5, 1e5), readonly=False, poll=True)
@ -138,7 +138,6 @@ class DPM3(HasIodev, Drivable):
def write_target(self, target): def write_target(self, target):
self._target = target self._target = target
self._started = True
if target - self.value > 0: if target - self.value > 0:
self._direction = 1 self._direction = 1
else: else:

4
secop_psi/softcal.py
View File

@ -27,7 +27,7 @@ from os.path import basename, exists, join
import numpy as np import numpy as np
from scipy.interpolate import splev, splrep # pylint: disable=import-error from scipy.interpolate import splev, splrep # pylint: disable=import-error
from secop.core import Attached, BoolType, Parameter, Readable, StringType from secop.core import Attached, BoolType, Parameter, Readable, StringType, FloatRange
def linear(x): def linear(x):
@ -174,7 +174,7 @@ class Sensor(Readable):
calib = Parameter('calibration name', datatype=StringType(), readonly=False) calib = Parameter('calibration name', datatype=StringType(), readonly=False)
abs = Parameter('True: take abs(raw) before calib', datatype=BoolType(), readonly=False, default=True) abs = Parameter('True: take abs(raw) before calib', datatype=BoolType(), readonly=False, default=True)
value = Parameter(unit='K') value = Parameter(datatype=FloatRange(unit='K'))
pollinterval = Parameter(export=False) pollinterval = Parameter(export=False)
status = Parameter(default=(Readable.Status.ERROR, 'unintialized')) status = Parameter(default=(Readable.Status.ERROR, 'unintialized'))