diff --git a/frappy_psi/lakeshore.py b/frappy_psi/lakeshore.py index 19aa369..64db28c 100644 --- a/frappy_psi/lakeshore.py +++ b/frappy_psi/lakeshore.py @@ -133,7 +133,7 @@ class HeaterOutput(LakeShore, HasControlledBy, HasIO, Writable): return max_power def set_range(self): - self.set_par('RANGE ', {self._range}) + self.set_par('RANGE ', self._range) def percent_to_power(self, percent): 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_range() percent = self.power_to_percent(target) - reply = self.set_par(f'MOUT {self.loop}, {percent:g}') - return self.percent_to_power(float(reply)) + reply, = self.set_par(f'MOUT {self.loop}, {percent:g}') + return self.percent_to_power(reply) def set_heater_mode(self, mode): 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) self.activate_output() out.set_range() - reply = self.set_par(f'SETP {self.loop},{target}') - return float(reply) + return self.set_par(f'SETP {self.loop},{target}')[0] 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): p, i, d = self.set_par(f'PID {self.loop}', ctrlpars['p'], ctrlpars['i'], ctrlpars['d'])