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

fix error from manual %-format conversion

Browse Source 
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:
zolliker
2023-04-20 15:33:44 +02:00
parent d99f2dfbc3
commit 64b4cba67c
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frappy_psi/ls370res.py
View File

@ -267,8 +267,7 @@ class ResChannel(Channel):
if self.autorange: if self.autorange:
if rng < self.minrange: if rng < self.minrange:
rng = self.minrange rng = self.minrange
self.communicate('RDGRNG %d,%d,%d,%d,%d,%d;*OPC?' % ( self.communicate(f'RDGRNG {self.channel},{iscur},{exc},{rng},0,{excoff};*OPC?')
self.channel, iscur, exc, rng, 0, excoff))
self.read_range() self.read_range()
def fix_autorange(self): def fix_autorange(self):
@ -290,12 +289,11 @@ class ResChannel(Channel):
@CommonWriteHandler(inset_params) @CommonWriteHandler(inset_params)
def write_inset(self, change): def write_inset(self, change):
_, _, _, curve, tempco = literal_eval( _, _, _, change['curve'], change['tempco'] = literal_eval(
self.communicate(f'INSET?{self.channel}')) self.communicate(f'INSET?{self.channel}'))
self.enabled, self.dwell, self.pause, _, _ = literal_eval( self.enabled, self.dwell, self.pause, _, _ = literal_eval(
self.communicate('INSET %d,%d,%d,%d,%d,%d;INSET?%d' % ( self.communicate('INSET {channel},{enabled:d},{dwell:d},'
self.channel, change['enabled'], change['dwell'], change['pause'], curve, tempco, '{pause:d},{curve},{tempco};INSET?{channel}'.format_map(change)))
self.channel)))
if 'enabled' in change and change['enabled']: if 'enabled' in change and change['enabled']:
# switch to enabled channel # switch to enabled channel
self.switcher.write_target(self.channel) self.switcher.write_target(self.channel)

7
frappy_psi/ppms.py
View File

@ -215,7 +215,7 @@ class DriverChannel(Channel):
:param values: a dict like object containing the parameters to be written :param values: a dict like object containing the parameters to be written
""" """
self.read_params() # make sure parameters are up to date 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 self.read_params() # read back
@ -260,9 +260,8 @@ class BridgeChannel(Channel):
values['excitation'] = 0 values['excitation'] = 0
values['powerlimit'] = 0 values['powerlimit'] = 0
values['voltagelimit'] = 0 values['voltagelimit'] = 0
self.comm_write(f"BRIDGE {values['no']},{values['enabled']:g},' \ self.comm_write('BRIDGE {no:d},{enabled:d},{powerlimit:g},{dcflag:d},'
f'{values['powerlimit']:g},{int(values['dcflag'])},{int(values['readingmode'])},' \ '{readingmode:d},{voltagelimit:g}'.format_map(values))
f'{values['voltagelimit']:g}")
self.read_params() # read back self.read_params() # read back