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

fix set_par/get_par calls

Browse Source 
Change-Id: Iff6b244ca381849333646853b4c0bb8a347bbb3b
This commit is contained in:
Oksana Shliakhtun 2023-01-30 17:09:46 +01:00
parent 866fe73f2e
commit 0dfaa79f77
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frappy_psi/lakeshore.py
View File

@ -133,7 +133,7 @@ class HeaterOutput(LakeShore, HasControlledBy, HasIO, Writable):
return max_power return max_power
def set_range(self): def set_range(self):
self.set_par('RANGE ', {self._range}) self.set_par('RANGE ', self._range)
def percent_to_power(self, percent): def percent_to_power(self, percent):
return min((percent / 100) ** 2 * self._max_power, return min((percent / 100) ** 2 * self._max_power,
@ -154,8 +154,8 @@ class HeaterOutput(LakeShore, HasControlledBy, HasIO, Writable):
self.set_heater_mode(3) self.set_heater_mode(3)
self.set_range() self.set_range()
percent = self.power_to_percent(target) percent = self.power_to_percent(target)
reply = self.set_par(f'MOUT {self.loop}, {percent:g}') reply, = self.set_par(f'MOUT {self.loop}, {percent:g}')
return self.percent_to_power(float(reply)) return self.percent_to_power(reply)
def set_heater_mode(self, mode): def set_heater_mode(self, mode):
self.communicate(f'CSET {self.loop},{self.channel},1,1,0;.' self.communicate(f'CSET {self.loop},{self.channel},1,1,0;.'
@ -178,11 +178,10 @@ class TemperatureLoop340(HasOutputModule, Sensor340, Drivable, LakeShore):
out.write_max_power(out.max_power) out.write_max_power(out.max_power)
self.activate_output() self.activate_output()
out.set_range() out.set_range()
reply = self.set_par(f'SETP {self.loop},{target}') return self.set_par(f'SETP {self.loop},{target}')[0]
return float(reply)
def read_target(self): def read_target(self):
return float(self.communicate(f'SETP? {self.loop}')) return self.get_par(f'SETP {self.loop}')[0]
def write_ctrlpars(self, ctrlpars): def write_ctrlpars(self, ctrlpars):
p, i, d = self.set_par(f'PID {self.loop}', ctrlpars['p'], ctrlpars['i'], ctrlpars['d']) p, i, d = self.set_par(f'PID {self.loop}', ctrlpars['p'], ctrlpars['i'], ctrlpars['d'])