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

remove 'maxage' argument for read_* methods

Browse Source 
'maxage' is not really used at any place. remove it, as this makes
the code cleaner

Change-Id: I6f10b4ab91fc57640336db1832716ca9012eb241
Reviewed-on: https://forge.frm2.tum.de/review/20347
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker
2019-04-09 10:45:45 +02:00
parent fa9e451c54
commit cafc7a1409
10 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
secop_ess/epics.py
View File

@ -103,10 +103,10 @@ class EpicsReadable(Readable):
pv = PV(pv_name + ".VAL")
pv.value = write_value
def read_value(self, maxage=0):
def read_value(self):
return self._read_pv(self.value_pv)
def read_status(self, maxage=0):
def read_status(self):
# XXX: comparison may need to be a little unsharp
# XXX: Hardware may have it's own idea about the status: how to obtain?
if self.status_pv != 'unset':
@ -164,16 +164,16 @@ class EpicsDrivable(Drivable):
pv = PV(pv_name + ".VAL")
pv.value = write_value
def read_target(self, maxage=0):
def read_target(self):
return self._read_pv(self.target_pv)
def write_target(self, write_value):
self._write_pv(self.target_pv, write_value)
def read_value(self, maxage=0):
def read_value(self):
return self._read_pv(self.value_pv)
def read_status(self, maxage=0):
def read_status(self):
# XXX: comparison may need to be a little unsharp
# XXX: Hardware may have it's own idea about the status: how to obtain?
if self.status_pv != 'unset':
@ -204,7 +204,7 @@ class EpicsTempCtrl(EpicsDrivable):
datatype=StringType(), default="unset", export=False,),
}
def read_target(self, maxage=0):
def read_target(self):
return self._read_pv(self.target_pv)
def write_target(self, write_value):
@ -213,19 +213,19 @@ class EpicsTempCtrl(EpicsDrivable):
# update our status
self.read_status()
def read_value(self, maxage=0):
def read_value(self):
return self._read_pv(self.value_pv)
def read_status(self, maxage=0):
def read_status(self):
# XXX: comparison may need to collect a history to detect oscillations
at_target = abs(self.read_value(maxage) - self.read_target(maxage)) \
at_target = abs(self.read_value() - self.read_target()) \
<= self.tolerance
if at_target:
return (Drivable.Status.IDLE, 'at Target')
return (Drivable.Status.BUSY, 'Moving')
# TODO: add support for strings over epics pv
# def read_heaterrange(self, maxage=0):
# def read_heaterrange(self):
# return self._read_pv(self.heaterrange_pv)
# TODO: add support for strings over epics pv