diff --git a/frappy_psi/triton.py b/frappy_psi/triton.py index 2ea892d..df5fdfa 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('cool down channel', StringType(), 'T4') value = Parameter('running action', EnumType(actions)) target = Parameter('action to do', EnumType(none=0, condense=1, collect=3), readonly=False) _target = 0 @@ -51,8 +52,9 @@ class Action(MercuryChannel, Writable): def write_target(self, value): self._target = value 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) return self.change('SYS:DR:ACTN', value, actions_map) # actions: