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

replace yesno with gui yesno

Browse Source
This commit is contained in:
x12sa
2026-07-12 07:28:10 +02:00
committed by holler
co-authored by holler
parent 956d1ad1bc
commit 7e437ae24f
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
+17 -14
View File
@@ -457,14 +457,14 @@ class FlomniSampleTransferMixin:
print("Moving X-ray eye in.")
if self.OMNYTools.yesno(
"Please confirm that this is ok with the flight tube. This check is to be removed after commissioning",
"n",
):
print("OK. continue.")
else:
print("Stopping.")
raise FlomniError("Manual abort of x-ray eye in.")
# if self.OMNYTools.yesno(
# "Please confirm that this is ok with the flight tube. This check is to be removed after commissioning",
# "n",
# ):
# print("OK. continue.")
# else:
# print("Stopping.")
# raise FlomniError("Manual abort of x-ray eye in.")
self.feye_in()
print("Moving X-ray optics out.")
@@ -1099,10 +1099,13 @@ class FlomniSampleTransferMixin:
fsamx_pos = dev.fsamx.readback.get()
if position == 0 and fsamx_pos > -160:
if self.OMNYTools.yesno(
"May the flomni stage be moved out for the sample change? Feedback will be disabled and alignment will be lost!",
"y",
):
print("Use GUI interface.")
if self.ftransfer_confirm_dialog("May the flomni stage be moved out for the sample change? Feedback will be disabled and alignment will be lost!", "y"):
# if self.OMNYTools.yesno(
# "May the flomni stage be moved out for the sample change? Feedback will be disabled and alignment will be lost!",
# "y",
# ):
print("OK. continue.")
self.ftransfer_flomni_stage_out()
else:
@@ -1113,7 +1116,7 @@ class FlomniSampleTransferMixin:
self.check_tray_in()
if position == 0:
umv(dev.ftransx, 11.05, dev.ftransz, 3.5950)
umv(dev.ftransx, 11.02, dev.ftransz, 3.5950)
if position == 1:
umv(
dev.ftransx,
@@ -2390,7 +2393,7 @@ class Flomni(
offsets = self.get_alignment_offset(angle)
normal_offset_x = offsets[0]
direction = -1 if normal_offset_x >= 0 else 1
sum_offset_x = normal_offset_x + direction * (self.fovx / 2) + direction * 10
sum_offset_x = normal_offset_x + direction * (self.fovx / 2) + direction * 20
sum_offset_y = (
offsets[1]
- self.compute_additional_correction_y(angle)