diff --git a/secop_psi/mercury.py b/secop_psi/mercury.py index 839a767..d6ec17a 100644 --- a/secop_psi/mercury.py +++ b/secop_psi/mercury.py @@ -267,7 +267,7 @@ class Loop(HasConvergence, MercuryChannel, Drivable): self.set_output(True) else: self.log.warning('switch loop control on') - self.write_control_active(True) + self.write_control_active(True) self.target = target self.start_state() diff --git a/secop_psi/triton.py b/secop_psi/triton.py index 533f5ee..982e0b6 100644 --- a/secop_psi/triton.py +++ b/secop_psi/triton.py @@ -38,6 +38,7 @@ actions_map.mapping['NONE'] = actions.none # when writing, STOP is used instead class Action(MercuryChannel, Writable): channel_type = 'ACTN' cooldown_channel = Property('cool down channel', StringType(), 'T5') + mix_channel = Property('mix channel', StringType(), 'T5') value = Parameter('running action', EnumType(actions)) target = Parameter('action to do', EnumType(none=0, condense=1, collect=3), readonly=False) _target = 0 @@ -51,6 +52,8 @@ 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) return self.change('SYS:DR:ACTN', value, actions_map) # actions: