From 924a9a2c7f8057ed75b919ddab5c1278065eab19 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 11 Jun 2024 18:01:52 +0200 Subject: [PATCH] frappy_psi.triton: bug fixes - fix channel numbers - make sure some channels are selected Change-Id: I11c553805ed5ee6235e54ce56a5ea68160d1d212 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33911 Reviewed-by: Markus Zolliker Tested-by: Jenkins Automated Tests --- frappy_psi/triton.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappy_psi/triton.py b/frappy_psi/triton.py index 6bf93c4f..555aa3f1 100644 --- a/frappy_psi/triton.py +++ b/frappy_psi/triton.py @@ -36,8 +36,9 @@ actions_map.mapping['NONE'] = actions.none # when writing, STOP is used instead class Action(MercuryChannel, Writable): kind = 'ACTN' - cooldown_channel = Property('cool down channel', StringType(), 'T5') + cooldown_channel = Property('cool down channel', StringType(), 'T3') mix_channel = Property('mix channel', StringType(), 'T5') + still_channel = Property('still channel', StringType(), 'T4') value = Parameter('running action', EnumType(actions)) target = FrozenParam('action to do', EnumType(none=0, condense=1, collect=3), readonly=False) _target = 0 @@ -50,9 +51,12 @@ class Action(MercuryChannel, Writable): read_target = read_value def write_target(self, value): + # because of some funny behavior of the triton software + # these channels must be set even when no change is needed self.change('SYS:DR:CHAN:COOL', self.cooldown_channel, str) - # self.change('SYS:DR:CHAN:MC', self.mix_channel, str) - # self.change('DEV:T5:TEMP:MEAS:ENAB', 'ON', str) + self.change('SYS:DR:CHAN:STIL', self.still_channel, str) + self.change('SYS:DR:CHAN:MC', self.mix_channel, str) + self.change('DEV:T5:TEMP:MEAS:ENAB', 'ON', str) self.change('SYS:DR:ACTN', value, actions_map) return value