fix error from manual %-format conversion
frappy_psi.ppms (line 263) was not correctly converted probably due to the fact, that dict access with f-strings gets quite ugly. As it seems we want to get rid of %-format, use str.format_map here. Change-Id: Idf5b700554aa7a02a6647dc4672bf4a3856f92a5 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30933 Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de> Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de> Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
This commit is contained in:
@ -215,7 +215,7 @@ class DriverChannel(Channel):
|
||||
:param values: a dict like object containing the parameters to be written
|
||||
"""
|
||||
self.read_params() # make sure parameters are up to date
|
||||
self.comm_write(f"DRVOUT {values['no']},{values['current']:g},{values['powerlimit']:g}")
|
||||
self.comm_write('DRVOUT {no:d},{current:g},{powerlimit:g}'.format_map(values))
|
||||
self.read_params() # read back
|
||||
|
||||
|
||||
@ -260,9 +260,8 @@ class BridgeChannel(Channel):
|
||||
values['excitation'] = 0
|
||||
values['powerlimit'] = 0
|
||||
values['voltagelimit'] = 0
|
||||
self.comm_write(f"BRIDGE {values['no']},{values['enabled']:g},' \
|
||||
f'{values['powerlimit']:g},{int(values['dcflag'])},{int(values['readingmode'])},' \
|
||||
f'{values['voltagelimit']:g}")
|
||||
self.comm_write('BRIDGE {no:d},{enabled:d},{powerlimit:g},{dcflag:d},'
|
||||
'{readingmode:d},{voltagelimit:g}'.format_map(values))
|
||||
self.read_params() # read back
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user