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

use flag instead tolerance for redo check

Browse Source 
when target is changed, a flag is set, and
this is used to jump back in the sequence to the right step
for redoing
This commit is contained in:
zolliker
2022-07-29 15:12:44 +02:00
parent 86767e2fa1
commit bb40a0820c
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
secop_psi/magfield.py
View File

@ -84,6 +84,7 @@ class Magfield(HasLimits, Drivable):
_state = None _state = None
_init = True _init = True
_super_sw_check = False _super_sw_check = False
_target_changed = False
switch_time = None switch_time = None
def doPoll(self): def doPoll(self):
@ -113,6 +114,7 @@ class Magfield(HasLimits, Drivable):
def write_target(self, target): def write_target(self, target):
self.check_limits(target) self.check_limits(target)
self._target_changed = target != self.target
self.target = target self.target = target
if not self._state.is_active: if not self._state.is_active:
# as long as the state machine is still running, it takes care of changing targets # as long as the state machine is still running, it takes care of changing targets
@ -145,7 +147,7 @@ class Magfield(HasLimits, Drivable):
def start_field_change(self, state): def start_field_change(self, state):
self.setFastPoll(True, 1.0) self.setFastPoll(True, 1.0)
self.status = Status.PREPARING, 'changed target field' self.status = Status.PREPARING, 'changed target field'
if self.persistent_field == self.target: if abs(self.target - self.persistent_field) <= self.tolerance: # short cut
return self.check_switch_off return self.check_switch_off
return self.start_ramp_to_field return self.start_ramp_to_field
@ -158,7 +160,7 @@ class Magfield(HasLimits, Drivable):
def ramp_to_field(self, state): def ramp_to_field(self, state):
"""ramping, wait for current at persistent field""" """ramping, wait for current at persistent field"""
if self.persistent_field == self.target: # short cut if abs(self.target - self.persistent_field) <= self.tolerance: # short cut
return self.check_switch_off return self.check_switch_off
if abs(self.current - self.persistent_field) > self.tolerance: if abs(self.current - self.persistent_field) > self.tolerance:
if state.init: if state.init:
@ -196,11 +198,11 @@ class Magfield(HasLimits, Drivable):
def switch_on(self, state): def switch_on(self, state):
"""wait for switch heater open""" """wait for switch heater open"""
if self.persistent_field == self.target: # short cut if abs(self.target - self.persistent_field) <= self.tolerance: # short cut
return self.check_switch_off return self.check_switch_off
if state.now - self.switch_time < self.wait_switch_on: if state.now - self.switch_time < self.wait_switch_on:
return Retry() return Retry()
state.set_point = self.target self._target_changed = False
return self.start_ramp_to_target return self.start_ramp_to_target
def start_ramp_to_target(self, state): def start_ramp_to_target(self, state):
@ -212,8 +214,8 @@ class Magfield(HasLimits, Drivable):
def ramp_to_target(self, state): def ramp_to_target(self, state):
"""ramp field to target""" """ramp field to target"""
if state.set_point != self.target: # target changed if self._target_changed:
state.set_point = self.target self._target_changed = False
return self.start_ramp_to_target return self.start_ramp_to_target
self.persistent_field = self.value self.persistent_field = self.value
# Remarks: assume there is a ramp limiting feature # Remarks: assume there is a ramp limiting feature
@ -226,6 +228,9 @@ class Magfield(HasLimits, Drivable):
def stabilize_field(self, state): def stabilize_field(self, state):
"""stabilize field""" """stabilize field"""
if self._target_changed:
self._target_changed = False
return self.start_ramp_to_target
self.persistent_field = self.value self.persistent_field = self.value
if state.now - state.stabilize_start < self.wait_stable_field: if state.now - state.stabilize_start < self.wait_stable_field:
if state.init: if state.init:
@ -253,9 +258,8 @@ class Magfield(HasLimits, Drivable):
def switch_off(self, state): def switch_off(self, state):
"""wait for switch heater closed""" """wait for switch heater closed"""
if self.persistent_field != self.target: # redo if self._target_changed or self.mode == Mode.DRIVEN:
return self.start_switch_on # target or mode has changed -> redo
if self.mode == Mode.DRIVEN:
return self.start_switch_on return self.start_switch_on
self.persistent_field = self.value self.persistent_field = self.value
if state.now - self.switch_time < self.wait_switch_off: if state.now - self.switch_time < self.wait_switch_off:
@ -272,7 +276,8 @@ class Magfield(HasLimits, Drivable):
def ramp_to_zero(self, state): def ramp_to_zero(self, state):
"""ramp field to zero""" """ramp field to zero"""
if self.persistent_field != self.target or self.mode == Mode.DRIVEN: # redo if self._target_changed or self.mode == Mode.DRIVEN:
# target or mode has changed -> redo
return self.start_field_change return self.start_field_change
if abs(self.current) > self.tolerance: if abs(self.current) > self.tolerance:
if state.init: if state.init: