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 <markus.zolliker@psi.ch> Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
This commit is contained in:
parent
f5667a9267
commit
0a98776e27
@ -38,7 +38,7 @@ class Action(MercuryChannel, Writable):
|
|||||||
kind = 'ACTN'
|
kind = 'ACTN'
|
||||||
cooldown_channel = Property('cool down channel', StringType(), 'T3')
|
cooldown_channel = Property('cool down channel', StringType(), 'T3')
|
||||||
mix_channel = Property('mix channel', StringType(), 'T5')
|
mix_channel = Property('mix channel', StringType(), 'T5')
|
||||||
still_channel = Property('cool down channel', StringType(), 'T4')
|
still_channel = Property('still channel', StringType(), 'T4')
|
||||||
value = Parameter('running action', EnumType(actions))
|
value = Parameter('running action', EnumType(actions))
|
||||||
target = FrozenParam('action to do', EnumType(none=0, condense=1, collect=3), readonly=False)
|
target = FrozenParam('action to do', EnumType(none=0, condense=1, collect=3), readonly=False)
|
||||||
_target = 0
|
_target = 0
|
||||||
@ -51,6 +51,8 @@ class Action(MercuryChannel, Writable):
|
|||||||
read_target = read_value
|
read_target = read_value
|
||||||
|
|
||||||
def write_target(self, 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:COOL', self.cooldown_channel, str)
|
||||||
self.change('SYS:DR:CHAN:STIL', self.still_channel, str)
|
self.change('SYS:DR:CHAN:STIL', self.still_channel, str)
|
||||||
self.change('SYS:DR:CHAN:MC', self.mix_channel, str)
|
self.change('SYS:DR:CHAN:MC', self.mix_channel, str)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user