remove 'maxage' argument for read_* methods

'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:
2019-04-09 10:45:45 +02:00
parent fa9e451c54
commit cafc7a1409
10 changed files with 82 additions and 82 deletions

View File

@ -140,16 +140,16 @@ class Cryostat(CryoBase):
self._stopflag = False
self._thread = mkthread(self.thread)
def read_status(self, maxage=0):
def read_status(self):
# instead of asking a 'Hardware' take the value from the simulation
return self.status
def read_value(self, maxage=0):
def read_value(self):
# return regulation value (averaged regulation temp)
return self.regulationtemp + \
self.jitter * (0.5 - random.random())
def read_target(self, maxage=0):
def read_target(self):
return self.target
def write_target(self, value):
@ -162,7 +162,7 @@ class Cryostat(CryoBase):
self.status = self.Status.BUSY, 'new target set'
return value
def read_maxpower(self, maxage=0):
def read_maxpower(self):
return self.maxpower
def write_maxpower(self, newpower):
@ -176,7 +176,7 @@ class Cryostat(CryoBase):
self.p, self.i, self.d = newpid
return (self.p, self.i, self.d)
def read_pid(self, maxage=0):
def read_pid(self):
return (self.p, self.i, self.d)
def do_stop(self):

View File

@ -53,13 +53,13 @@ class Switch(Drivable):
),
}
def read_value(self, maxage=0):
def read_value(self):
# could ask HW
# we just return the value of the target here.
self._update()
return self.value
def read_target(self, maxage=0):
def read_target(self):
# could ask HW
return self.target
@ -69,7 +69,7 @@ class Switch(Drivable):
# note: setting self.target to the new value is done after this....
# note: we may also return the read-back value from the hw here
def read_status(self, maxage=0):
def read_status(self):
self.log.info("read status")
info = self._update()
if self.target == self.value:
@ -129,7 +129,7 @@ class MagneticField(Drivable):
_thread.daemon = True
_thread.start()
def read_value(self, maxage=0):
def read_value(self):
return self.value
def write_target(self, value):
@ -139,7 +139,7 @@ class MagneticField(Drivable):
# note: setting self.target to the new value is done after this....
# note: we may also return the read-back value from the hw here
def read_status(self, maxage=0):
def read_status(self):
if self._state == self._state.enum.idle:
return (self.Status.PERSIST, 'at field') if self.value else \
(self.Status.IDLE, 'zero field')
@ -206,7 +206,7 @@ class CoilTemp(Readable):
),
}
def read_value(self, maxage=0):
def read_value(self):
return round(2.3 + random.random(), 3)
@ -275,7 +275,7 @@ class Label(Readable):
),
}
def read_value(self, maxage=0):
def read_value(self):
strings = [self.system]
dev_ts = self.DISPATCHER.get_module(self.subdev_ts)

View File

@ -44,7 +44,7 @@ class LN2(Readable):
but the implementation may do anything
"""
def read_value(self, maxage=0):
def read_value(self):
return round(100 * random.random(), 1)
@ -60,7 +60,7 @@ class Heater(Drivable):
),
}
def read_value(self, maxage=0):
def read_value(self):
return round(100 * random.random(), 1)
def write_target(self, target):
@ -90,7 +90,7 @@ class Temp(Drivable):
),
}
def read_value(self, maxage=0):
def read_value(self):
return round(100 * random.random(), 1)
def write_target(self, target):