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

fixes on HasConvergence and HasOutputModule

Browse Source 
- HasConvergence must inherit from HasStates
- control_active should have a default

Change-Id: Ic8b430003fdb746bf76782b74fa04e43c700c2e2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31023
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker
2023-05-04 16:26:01 +02:00
parent ed61a2f7ce
commit 761b7b4cf8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frappy/mixins.py
View File

@ -65,7 +65,7 @@ class HasOutputModule(Writable):
""" """
# mandatory=False: it should be possible to configure a module with fixed control # mandatory=False: it should be possible to configure a module with fixed control
output_module = Attached(HasControlledBy, mandatory=False) output_module = Attached(HasControlledBy, mandatory=False)
control_active = Parameter('control mode', BoolType()) control_active = Parameter('control mode', BoolType(), default=False)
def initModule(self): def initModule(self):
super().initModule() super().initModule()

3
frappy_psi/convergence.py
View File

@ -21,10 +21,11 @@
# ***************************************************************************** # *****************************************************************************
from frappy.core import Parameter, FloatRange, BUSY, IDLE, WARN from frappy.core import Parameter, FloatRange, BUSY, IDLE, WARN
from frappy.states import HasStates
from frappy.lib.statemachine import StateMachine, Retry, Stop from frappy.lib.statemachine import StateMachine, Retry, Stop
class HasConvergence: class HasConvergence(HasStates):
"""mixin for convergence checks """mixin for convergence checks
Implementation based on tolerance, settling time and timeout. Implementation based on tolerance, settling time and timeout.