bec/csaxs_bec
0
0 Fork 3
Code Issues 17 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix(omny): remove OMNYTemperatures._set_TEMP_default_setpoints - defaults only in the controllers #345

Merged
holler merged 1 commits from omny-temperature-defaults-in-controllers into main 2026-10-27 20:43:23 +01:00
Conversation 0 Commits 1 Files Changed 2
+8 -63
2 changed files with 8 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

csaxs_bec/devices/omny/omny_temperatures.py
+4 -60
View File
@@ -18,7 +18,6 @@ class OMNYTemperatures(Device):
"set_setpoint",
"show_all",
"help",
"_set_TEMP_default_setpoints",
"temperature_controller_TEMP_running",
"temperature_controller_CRYO_running",
]
@@ -96,65 +95,10 @@ class OMNYTemperatures(Device):
raise OMNYTemperaturesError("invalid type")
def _set_TEMP_default_setpoints(self):
self.set_setpoint("TEMP",8,-199.9)
time.sleep(0.1)
self.set_setpoint("TEMP",9,23)
time.sleep(0.1)
self.set_setpoint("TEMP",10,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",16,-199.9)
time.sleep(0.1)
self.set_setpoint("TEMP",17,23)
time.sleep(0.1)
self.set_setpoint("TEMP",18,26)
time.sleep(0.1)
self.set_setpoint("TEMP",19,26)
time.sleep(0.1)
self.set_setpoint("TEMP",20,26)
time.sleep(0.1)
self.set_setpoint("TEMP",21,23)
time.sleep(0.1)
self.set_setpoint("TEMP",22,-199.9)
time.sleep(0.1)
self.set_setpoint("TEMP",23,-199.9)
time.sleep(0.1)
self.set_setpoint("TEMP",24,-199.9)
time.sleep(0.1)
self.set_setpoint("TEMP",25,25)
time.sleep(0.1)
self.set_setpoint("TEMP",27,25)
time.sleep(0.1)
self.set_setpoint("TEMP",28,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",29,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",30,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",31,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",35,25)
time.sleep(0.1)
self.set_setpoint("TEMP",36,25)
time.sleep(0.1)
self.set_setpoint("TEMP",37,25)
time.sleep(0.1)
self.set_setpoint("TEMP",38,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",39,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",41,30)
time.sleep(0.1)
self.set_setpoint("TEMP",42,25)
time.sleep(0.1)
self.set_setpoint("TEMP",44,25)
time.sleep(0.1)
self.set_setpoint("TEMP",45,-199.9)
time.sleep(0.1)
self.set_setpoint("TEMP",46,73.2)
time.sleep(0.1)
self.set_setpoint("TEMP",47,73.2)
time.sleep(0.1)
# The default setpoints are stored only in the temperature controllers (EEPROM); the
# former _set_TEMP_default_setpoints() kept a second copy here (removed 2026-10-27,
# decision Mirko). The OMNY service tempcontrol.py seeds the :SET PVs from the
# controllers and writes a setpoint only when a :SET value is changed (heated channels).
def temperature_controller_TEMP_running(self):
time_diff = np.fabs(float(self.temperature_update_time.get()) - time.time())
csaxs_bec/devices/sim/sim_omny.py
+4 -3
View File
@@ -318,9 +318,10 @@ class SimOMNYDewar(OMNYDewar):
# OMNY temperature-controller channels ("TEMP" bank, channels 1-48), sourced from the
# real OMNY_tempcontroller/tempcontrol.py channel config (name, EGU, ChanHeat, ALARMLIM)
# cross-referenced against OMNYTemperatures._set_TEMP_default_setpoints()'s existing
# per-channel setpoints (already in this repo, confirmed to cover exactly the same 29
# channels -- the setpoint value below is copied from that method, not re-derived).
# cross-referenced against the per-channel setpoints of the former
# OMNYTemperatures._set_TEMP_default_setpoints() (removed 2026-10-27: the defaults live
# only in the controllers; values checked against the controllers on mpc3217 the same
# day -- 73.2 K here vs. -199.9 degC = 73.25 K there).
# Sentinel setpoints ("no active control": -199.9 degC / 73.2 K, matching
# tempcontrol.py's configure_device()'s unused-channel convention) mark monitor-only
# channels (ChanHeat=0); those get a plausible physical reading instead of the sentinel.