linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappy_psi.triton: fix heater output issue

Browse Source 
when output_module is not HeaterOutputWith range, the heater limit
can not be changed

Change-Id: If25a609e9f9667dc111cb220024388a51df993ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
zolliker 2023-12-12 12:11:13 +01:00
parent 0a98776e27
commit 20596744f9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frappy_psi/triton.py
View File

@ -275,9 +275,12 @@ class TemperatureLoop(ScannerChannel, mercury.TemperatureLoop):
self.change('SYS:DR:CHAN:%s' % self.system_channel, self.slot.split(',')[0], str) self.change('SYS:DR:CHAN:%s' % self.system_channel, self.slot.split(',')[0], str)
if active: if active:
self.change('DEV::TEMP:LOOP:FILT:ENAB', 'ON', str) self.change('DEV::TEMP:LOOP:FILT:ENAB', 'ON', str)
if self.output_module: try:
limit = self.output_module.read_limit() limit = self.output_module.read_limit()
# output_module is an instance of HeaterOutputWithRange
self.output_module.write_limit(limit) self.output_module.write_limit(limit)
except AttributeError:
pass # output_module is None or an instance of HeaterOutput
class HeaterOutput(HasInput, MercuryChannel, Writable): class HeaterOutput(HasInput, MercuryChannel, Writable):