From 8e6054ce648101d9bcc2bf80c49ee885c9ef8cb6 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Thu, 12 Nov 2026 16:47:12 +0100 Subject: [PATCH] working on DIL5 --- cfg/dil5_cfg.py | 44 +++++++++-------- frappy_psi/dilution.py | 14 ++++-- frappy_psi/logo.py | 108 ++++++++++++++++++++++++++--------------- 3 files changed, 103 insertions(+), 63 deletions(-) diff --git a/cfg/dil5_cfg.py b/cfg/dil5_cfg.py index ca34d360..03e7bcdd 100644 --- a/cfg/dil5_cfg.py +++ b/cfg/dil5_cfg.py @@ -27,16 +27,16 @@ Mod('V1', 'frappy_psi.logo.DigitalActuator', 'Valves', io = 'logo', - feedback_addr ="V1025.0", - output_addr ="V1064.3" + output_addr ="V1025.0", + target_addr ="V1064.3" ) Mod('V2', - 'frappy_psi.logo.DigitalActuator', + 'frappy_psi.logo.DigitalActuatorWithFeedback', 'dil bypass', io = 'logo', - feedback_addr ="V1024.2", - output_addr ="V1064.0", + feedback_addr = "V1024.2", + target_addr = "V1064.0", ) Mod('V4', @@ -44,16 +44,16 @@ Mod('V4', 'compressor to dump', io = 'logo', # feedback seems not to work - output_addr ="V1064.7", - target_addr ="V404.1", + output_addr = "V1064.7", + target_addr = "V404.1", ) Mod('V5', - 'frappy_psi.logo.DigitalActuator', + 'frappy_psi.logo.DigitalActuatorWithFeedback', 'compressor input', io = 'logo', - feedback_addr ="V1024.4", - output_addr ="V1064.2", + feedback_addr = "V1024.4", + target_addr = "V1064.2", ) Mod('V9', @@ -61,32 +61,32 @@ Mod('V9', 'dump output', io = 'logo', delay_addr = 'VW24', - feedback_addr ="V1024.3", - output_addr ="V1064.5", - target_addr ="V404.3", + feedback_addr = "V1024.3", + output_addr = "V1064.5", + target_addr = "V404.3", ) Mod('forepump', 'frappy_psi.logo.DigitalActuator', 'forepump', io = 'logo', - output_addr ="V1064.6", - target_addr ="V404.4", + output_addr = "V1064.6", + target_addr = "V404.4", ) Mod('compressor', 'frappy_psi.logo.DigitalActuator', '', io = 'logo', - output_addr ="V1064.4", - target_addr ="V404.2", + output_addr = "V1064.4", + target_addr = "V404.2", ) Mod('p2', 'frappy_psi.logo.Pressure', 'pressure after compressor', io = 'logo', - addr ="VW0", + addr = "VW0", pollinterval=0.5, ) @@ -94,7 +94,7 @@ Mod('p1', 'frappy_psi.logo.Pressure', 'dump pressure', io = 'logo', - addr ="VW28", + addr = "VW28", pollinterval=0.5, ) @@ -102,7 +102,7 @@ Mod('p5', 'frappy_psi.logo.Pressure', 'pressure after forepump', io = 'logo', - addr ="VW4", + addr = "VW4", pollinterval = 0.5, ) @@ -110,7 +110,7 @@ Mod('airpressure', 'frappy_psi.logo.Comparator', 'Airpressure state', io = 'logo', - addr ="V1024.7", + addr = "V1024.7", threshold = 0.5, # TODO: check if we can read the air pressure instead of a flag pollinterval = 0.5, ) @@ -293,6 +293,8 @@ Mod('dil', condensing_p_low = 1400, condensing_p_high = 1700, dump_low = 20, + end_remove_turbo_pressure = 2e-3, + end_remove_pressure = 0.07, ) ## Dilution lakeshore Temperature controller diff --git a/frappy_psi/dilution.py b/frappy_psi/dilution.py index 57ff932c..c8e73b4e 100644 --- a/frappy_psi/dilution.py +++ b/frappy_psi/dilution.py @@ -21,6 +21,7 @@ # ***************************************************************************** import time +from collections import defaultdict from frappy.core import Readable, Drivable, Parameter, Attached, FloatRange, \ Command, IDLE, BUSY, WARN, ERROR, Property from frappy.datatypes import EnumType, IntRange, BoolType, StructOf, StringType @@ -187,6 +188,7 @@ class Dilution(HasStates, Drivable): """Entfernt die Mischung.""" if state.init: + self.log.info('remove %r', self.remove_valves) self.handle_valves(self.remove_valves) if self.turbopump is not None: self._start_time = state.now @@ -253,17 +255,23 @@ class Dilution(HasStates, Drivable): returns failed valves raises ImpossibleError, when checks fails """ + self.log.info('inner') self._valves_to_wait_for = {} self._valve_change_time = time.monotonic() - valves_failed = {True: [], False: []} + valves_failed = defaultdict(list) for flag, valves in enumerate([check_closed, check_open]): + self.log.info('flag %r %r', flag, valves) for vname in valves.split(): if self.secNode.modules[vname].read_value() != flag: valves_failed[flag].append(vname) - if valves_failed: + if not any(valves_failed.values()): + self.log.info('valves_failed %r', valves_failed) return valves_failed + self.log.info('handle close=%r open=%r', close, open) for flag, valves in enumerate([close, open]): + self.log.info('flag %r valves %s', flag, valves) for vname in valves.split(): + self.log.info('flag %r valve %s', flag, vname) valve = self.secNode.modules[vname] valve.write_target(flag) if valve.isBusy(): @@ -271,7 +279,7 @@ class Dilution(HasStates, Drivable): elif valve.read_value() != flag: self.log.warn('valve %s=%r did not go to %r', vname, self.secNode.modules[vname].read_value(), flag) # self._valves_failed[flag].append(vname) - return {} + return valves_failed def handle_valves(self, valveset): """check or set given valves diff --git a/frappy_psi/logo.py b/frappy_psi/logo.py index d2404be4..83e61e2d 100644 --- a/frappy_psi/logo.py +++ b/frappy_psi/logo.py @@ -93,35 +93,15 @@ class LogoMixin(HasIO): return int(reply) * scale -class DigitalActuator(LogoMixin, Writable): - """output with or without feedback""" - output_addr = Property('VM address output', datatype=StringType(), default='') - target_addr = Property('VM address target', datatype=StringType(), default='') - feedback_addr = Property('VM address feedback', datatype=StringType(), default='') +class DigitalActuatorBase(LogoMixin): + """output without feedback""" target = Parameter('target', datatype=BoolType()) - value = Parameter('feedback or output', datatype=BoolType()) - _input = 'output' - _value_addr = None - _target_addr = None + value = Parameter('output', datatype=BoolType()) _fault = None def doPoll(self): self.read_status() # this calls also read_value - def checkProperties(self): - super().checkProperties() - if self.feedback_addr: - self._input = 'feedback' - self._value_addr = self.feedback_addr - else: - self._input = 'output' - self._value_addr = self.output_addr - self._target_addr = self.target_addr or self.output_addr - if self._target_addr and self._value_addr: - self._check_feedback = self.feedback_addr and self.output_addr - return - raise ConfigError('need either output_addr or both feedback_addr and target_addr') - def initialReads(self): super().initialReads() self.target = self.read_value() @@ -140,20 +120,24 @@ class DigitalActuator(LogoMixin, Writable): self._fault = None self.read_status() + +class DigitalActuator(DigitalActuatorBase, Writable): + """output without feedback""" + output_addr = Property('VM address output', datatype=StringType()) + target_addr = Property('VM address target', datatype=StringType(), default='') + _target_addr = None + + def checkProperties(self): + super().checkProperties() + self._target_addr = self.target_addr or self.output_addr + def read_value(self): - return self.get_vm_value(self._value_addr) + return self.get_vm_value(self.output_addr) def write_target(self, target): self._fault = None self.set_vm_value(self._target_addr, target) - value = self.read_value() - if value != target and self.feedback_addr: - # retry only if we have a feedback and the feedback did not change yet - for i in range(20): - if self.read_value() == target: - self.log.debug('tried %d times', i) - break - self.set_vm_value(self._target_addr, target) + self.read_value() def read_status(self): if self._fault: @@ -161,16 +145,62 @@ class DigitalActuator(LogoMixin, Writable): value = self.read_value() if value != self.target: return ERROR, 'value and target do not match' - if self._check_feedback: - if value != self.get_vm_value(self._check_feedback): - return ERROR, f'feedback does not match output' - if self.feedback_addr: - return IDLE, 'feedback confirmed' return IDLE, '' +class DigitalActuatorWithFeedback(DigitalActuatorBase, Drivable): + maxretry = Parameter('maximum number of retries', + IntRange(0, 99), readonly=False, default=9) + feedback_addr = Property('VM address feedback', datatype=StringType()) + target_addr = Property('VM address target', datatype=StringType()) + _retry_cnt = 0 + _busy_text = '' + + def read_value(self): + return self.value + + def read_status(self): + if self._fault: + return ERROR, self._fault + self.value = self.get_vm_value(self.feedback_addr) + if self._busy_text: + if self.target == self.value: + self.log.info('success v=%r t=%r', self.value, self.target) + self._busy_text = '' + else: + if self._retry_cnt >= self.maxretry: + self.setFastPoll(False) + self.set_vm_value(self.target_addr, self.value) + self._fault = f'did not manage to switch with {self.maxretry} tries' + return ERROR, self._fault + self.log.info('retry %r', self._retry_cnt) + self._retry_cnt += 1 + self._busy_text = 'retry' + self.set_vm_value(self.target_addr, self._next_target) + self._next_target = not self._next_target + return BUSY, self._busy_text + self.setFastPoll(False) + return IDLE, '' + + def write_target(self, target): + self._fault = None + self.set_vm_value(self.target_addr, target) + self.value = self.get_vm_value(self.feedback_addr) + if target != self.value: + self._retry_cnt = 1 + self._busy_text = 'retry' + self._next_target = target + self.setFastPoll(True, 0.25) + self.status = BUSY, self._busy_text + return + self._busy_text = '' + self.target = target + self.read_status() + + class DelayedActuator(DigitalActuator, Drivable): delay_addr = Property('address of delay value', StringType()) + feedback_addr = Property('VM address feedback', datatype=StringType()) _pulse_start = 0 _pulse_end = 0 _fault = None @@ -187,7 +217,7 @@ class DelayedActuator(DigitalActuator, Drivable): elif now < self._pulse_end - 1: if not value: self._pulse_start = 0 - return WARN, f'{self._input} is not on during pulse - due to interlock?' + return WARN, f'output is not on during pulse - due to interlock?' if value: if now < self._pulse_end + 1: return BUSY, 'pulsing' @@ -195,7 +225,7 @@ class DelayedActuator(DigitalActuator, Drivable): self.set_vm_value(self._target_addr, 0) self._pulse_start = 0 self.set_vm_value(self.delay_addr, 0) - elif self._check_feedback and value != self.get_vm_value(self._check_feedback): + elif value != self.get_vm_value(self.feedback_addr): fberror = ERROR, f'feedback does not match output' if value != self.target: return ERROR, 'value does not match target'