diff --git a/csaxs_bec/devices/omny/omny_temperatures.py b/csaxs_bec/devices/omny/omny_temperatures.py index e2dd10c..0d4ecc7 100644 --- a/csaxs_bec/devices/omny/omny_temperatures.py +++ b/csaxs_bec/devices/omny/omny_temperatures.py @@ -90,6 +90,11 @@ class OMNYTemperatures(Device): def set_setpoint(self, type: str, controller_nr: int, temperature: float): if type == "TEMP": getattr(self.temperature_setpoint, f"temperature_setpoint{controller_nr}").set(temperature) + elif type == "CRYO": + getattr(self.cryo_temperature_setpoint, f"cryo_temperature_setpoint{controller_nr}").set(temperature) + else: + raise OMNYTemperaturesError("invalid type") + def _set_TEMP_default_setpoints(self): self.set_setpoint("TEMP",8,-199.9) @@ -179,8 +184,8 @@ class OMNYTemperatures(Device): return (True, controller_name, temperature, setpoint, unit, alarmstate,controller_running) elif type == "CRYO": controller_name = str(getattr(self.cryo_temperature_name, f"cryo_temperature_name{controller_nr}").get()) - temperature = float(getattr(self.temperature, f"temperature{controller_nr}").get()) - setpoint = float(getattr(self.temperature_setpoint, f"temperature_setpoint{controller_nr}").get()) + temperature = float(getattr(self.cryo_temperature, f"cryo_temperature{controller_nr}").get()) + setpoint = float(getattr(self.cryo_temperature_setpoint, f"cryo_temperature_setpoint{controller_nr}").get()) unit = 'K' alarmstate = False controller_running = self.temperature_controller_CRYO_running() @@ -219,7 +224,7 @@ class OMNYTemperatures(Device): print(t) if not self.temperature_controller_TEMP_running(): print (red + "Warning: the temperature controller communication is not running" + white) - print (f"The last update was {datetime.datetime.fromtimestamp(float(self.temperature_update_time.get())).strftime('%c')}") + print (f"The last update was {datetime.datetime.fromtimestamp(float(self.temperature_update_time.get())).strftime('%c')}\n") t.clear() @@ -246,8 +251,8 @@ class OMNYTemperatures(Device): if not self.temperature_controller_CRYO_running(): print (red + "Warning: the temperature controller communication is not running" + white) - print (f"The last update was {datetime.datetime.fromtimestamp(float(self.cryo_temperature_update_time.get())).strftime('%c')}") + print (f"The last update was {datetime.datetime.fromtimestamp(float(self.cryo_temperature_update_time.get())).strftime('%c')}\n") print("Use dev.omny_temperatures.help() for assistance.")