diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/AI_docs/OPEN_ISSUES.md b/csaxs_bec/bec_ipython_client/plugins/omny/AI_docs/OPEN_ISSUES.md index 6dd51135..1f043c8d 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/AI_docs/OPEN_ISSUES.md +++ b/csaxs_bec/bec_ipython_client/plugins/omny/AI_docs/OPEN_ISSUES.md @@ -119,6 +119,26 @@ just those. Mirko's call: keep it simple for this pass, revisit later. Not a cra `omny_webpage_generator.py` already reads the ETA-ish fields defensively via `.get()`, degrading to "N/A" when absent, and that file is unwired/dead code anyway (see below). +## cam_xeye device (simulated only, real hardware config still needed) + +`omnygui_show_xeyealign()` uses the shared `OMNY_XRayEye` widget +(`csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py`), which hardcodes `CAMERA = ("cam_xeye", +"image")` as a module-level constant -- the device name isn't configurable per-beamline. omny's +config had no `cam_xeye` device at all, so simply calling `omnygui_show_xeyealign()` failed with +`ValueError: Device 'cam_xeye' not found in current BEC session` as soon as the widget was +constructed. Added a `cam_xeye` entry to `simulated_omny.yaml` (hand-added, not generated -- +`ptycho_omny.yaml`, the generator's source, has no such device), reusing flomni's real `cam_xeye`'s +`camera_id`/`pixel_calibration` as placeholders (`SimIDSCamera` accepts both `camera_id` and the +legacy `camera_ID` key omny's other sim cameras use). **Two follow-ups still needed before real +hardware use:** +- `ptycho_omny.yaml` needs a real `cam_xeye` entry with OMNY's actual x-ray-eye camera hardware + `camera_id` and measured `pixel_calibration` (mm/pixel) -- unknown to me, needs Mirko. +- `simulated_omny.yaml` is regenerated by `bin/generate_simulated_configs.py` from + `ptycho_omny.yaml`; since `cam_xeye` isn't in the real config yet, a regen will drop this + hand-added block until the real config also has one (matches the existing pattern for + `sim_velocity`/`sim_initial_position` hand-additions elsewhere in this file, already present + before this session). + ## Environment note (not code, but will bite again if forgotten) Both `csaxs_bec` and `bec_widgets` were pip-installed editable pointing at pre-repo- diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py b/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py index d2a41535..037a1eff 100644 --- a/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py +++ b/csaxs_bec/bec_ipython_client/plugins/omny/gui_tools.py @@ -98,53 +98,6 @@ class OMNYGuiTools: self.omnygui_show_omnycam_parking() def omnygui_show_omnycam_parking(self): - self.omnygui_show_gui() - if self._omnygui_is_missing("fig200") or self._omnygui_is_missing("fig203"): - self.omnygui_remove_all_docks() - self.fig200 = self.gui.omny.new("BECImageWidget") - if self._omnycam_check_device_exists(dev.cam200): - fig = self.fig200.image("cam200") - fig.set_rotation(deg_90=3) - self.fig200.lock_aspect_ratio(True) - else: - print("Cannot open cam200. Device does not exist.") - self.fig203 = self.gui.omny.new("BECImageWidget") - if self._omnycam_check_device_exists(dev.cam203): - fig = self.fig203.image("cam203") - fig.set_rotation(deg_90=3) - self.fig203.lock_aspect_ratio(True) - else: - print("Cannot open cam203. Device does not exist.") - - def _omnycam_samplestage(self): - self.omnygui_show_omnycam_samplestage() - - def omnygui_show_omnycam_samplestage(self): - self.omnygui_show_gui() - if self._omnygui_is_missing("fig201") or self._omnygui_is_missing("fig202"): - self.omnygui_remove_all_docks() - self.fig201 = self.gui.omny.new("BECImageWidget") - if self._omnycam_check_device_exists(dev.cam201): - fig = self.fig201.image("cam201") - fig.set_rotation(deg_90=3) - self.fig201.lock_aspect_ratio(True) - else: - print("Cannot open cam201. Device does not exist.") - self.fig202 = self.gui.omny.new("BECImageWidget") - if self._omnycam_check_device_exists(dev.cam202): - fig = self.fig202.image("cam202") - fig.set_rotation(deg_90=3) - self.fig202.lock_aspect_ratio(True) - else: - print("Cannot open cam202. Device does not exist.") - - def omnygui_show_cameras(self): - """General camera view + hard-stop console, the omny analog of - flomni's flomnigui_show_cameras(). Distinct from - omnygui_show_omnycam_parking()/omnygui_show_omnycam_samplestage() - above, which are omny's own pre-existing, narrower parking/ - samplestage-specific views -- left untouched. - """ self.omnygui_show_gui() if ( self._omnygui_is_missing("fig200") @@ -152,25 +105,61 @@ class OMNYGuiTools: or self._omnygui_is_missing("console") ): self.omnygui_remove_all_docks() - self.fig200 = self.gui.omny.new("BECImageWidget") + self.fig200 = self.gui.omny.new("Image") if self._omnycam_check_device_exists(dev.cam200): - fig = self.fig200.image("cam200") - fig.set_rotation(deg_90=3) - self.fig200.lock_aspect_ratio(True) + self.fig200.image(device="cam200", signal="preview") + self.fig200.num_rotation_90 = 3 + self.fig200.lock_aspect_ratio = True + dev.cam200.start_live_mode() else: print("Cannot open cam200. Device does not exist.") - self.fig203 = self.gui.omny.new("BECImageWidget") + self.fig203 = self.gui.omny.new("Image") if self._omnycam_check_device_exists(dev.cam203): - fig = self.fig203.image("cam203") - fig.set_rotation(deg_90=3) - self.fig203.lock_aspect_ratio(True) + self.fig203.image(device="cam203", signal="preview") + self.fig203.num_rotation_90 = 3 + self.fig203.lock_aspect_ratio = True + dev.cam203.start_live_mode() else: print("Cannot open cam203. Device does not exist.") # Hard-stop console, docked below the cameras. otransy is the # closest omny analog to flomni's ftransy (both the transfer-Y - # axis) -- no secondary/extra stop device wired yet (Mirko's - # call, revisit once a second candidate is confirmed). + # axis) -- no secondary/extra stop device wired yet. + self.console = self.gui.omny.new( + "z_ConsoleButtonsWidget", + object_name="console", + where="bottom", + hard_stop_device_name="otransy", + hard_stop_label="OMNY Motion Stop", + ) + self.gui.omny.set_layout_ratios(vertical=[5, 1]) + + def _omnycam_samplestage(self): + self.omnygui_show_omnycam_samplestage() + + def omnygui_show_omnycam_samplestage(self): + self.omnygui_show_gui() + if ( + self._omnygui_is_missing("fig201") + or self._omnygui_is_missing("fig202") + or self._omnygui_is_missing("console") + ): + self.omnygui_remove_all_docks() + self.fig201 = self.gui.omny.new("Image") + if self._omnycam_check_device_exists(dev.cam201): + self.fig201.image(device="cam201", signal="preview") + self.fig201.lock_aspect_ratio = True + dev.cam201.start_live_mode() + else: + print("Cannot open cam201. Device does not exist.") + self.fig202 = self.gui.omny.new("Image") + if self._omnycam_check_device_exists(dev.cam202): + self.fig202.image(device="cam202", signal="preview") + self.fig202.lock_aspect_ratio = True + dev.cam202.start_live_mode() + else: + print("Cannot open cam202. Device does not exist.") + self.console = self.gui.omny.new( "z_ConsoleButtonsWidget", object_name="console", diff --git a/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml b/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml index ab2abaa7..46925f66 100644 --- a/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml +++ b/csaxs_bec/device_configs/simulated_omny/simulated_omny.yaml @@ -60,6 +60,30 @@ cam203: readoutPriority: async deviceTags: - simulated_omny +# Hand-added (not part of the generated ptycho_omny.yaml source -- OMNY has no cam_xeye +# entry in the real config yet). The OMNY_XRayEye widget hardcodes the device name +# "cam_xeye", so omnygui_show_xeyealign() needs one to exist even in simulation. +# camera_id/pixel_calibration are placeholders duplicated from flomni's real cam_xeye +# (simulated_flomni.yaml); see omny/AI_docs/OPEN_ISSUES.md for the real-hardware follow-up. +cam_xeye: + description: Camera OMNY Xray eye (simulated, placeholder) + deviceClass: csaxs_bec.devices.sim.sim_cameras.SimIDSCamera + deviceConfig: + camera_id: 11 + bits_per_pixel: 24 + num_rotation_90: 0 + transpose: true + force_monochrome: true + m_n_colormode: 1 + sim_noise_std: 0 + enabled: true + onFailure: buffer + readOnly: false + readoutPriority: async + userParameter: + pixel_calibration: 0.00044247787610619477 # mm/pixel, placeholder (flomni's value) + deviceTags: + - simulated_omny rtx: description: OMNY rt deviceClass: csaxs_bec.devices.sim.sim_omny.SimRtOMNYMotor diff --git a/tests/tests_bec_ipython_client/test_omny_gui_tools.py b/tests/tests_bec_ipython_client/test_omny_gui_tools.py index 4786e180..5e02edc7 100644 --- a/tests/tests_bec_ipython_client/test_omny_gui_tools.py +++ b/tests/tests_bec_ipython_client/test_omny_gui_tools.py @@ -104,3 +104,62 @@ def test_omnygui_show_gui_creates_new_window_when_absent(): client.gui.new.assert_called_once() assert tools.omny_window is new_window + + +def test_omnygui_show_cameras_was_removed(): + """omnygui_show_cameras() duplicated omnygui_show_omnycam_parking() (both just + showed cam200/cam203) and was dropped -- the console now lives directly in the + parking/samplestage views instead.""" + assert not hasattr(OMNYGuiTools, "omnygui_show_cameras") + + +def test_omnygui_show_omnycam_parking_uses_current_image_widget_api(): + tools, client = _make_gui_tools() + client.gui.windows = {"omny": mock.MagicMock()} + fig200 = mock.MagicMock() + fig203 = mock.MagicMock() + console = mock.MagicMock() + client.gui.omny.new.side_effect = [fig200, fig203, console] + + dev_mock = mock.MagicMock() + + with mock.patch(f"{GUI_TOOLS}.dev", dev_mock, create=True): + tools.omnygui_show_omnycam_parking() + + client.gui.omny.new.assert_any_call("Image") + fig200.image.assert_called_once_with(device="cam200", signal="preview") + assert fig200.num_rotation_90 == 3 + assert fig200.lock_aspect_ratio is True + dev_mock.cam200.start_live_mode.assert_called_once() + fig203.image.assert_called_once_with(device="cam203", signal="preview") + dev_mock.cam203.start_live_mode.assert_called_once() + + client.gui.omny.new.assert_any_call( + "z_ConsoleButtonsWidget", + object_name="console", + where="bottom", + hard_stop_device_name="otransy", + hard_stop_label="OMNY Motion Stop", + ) + assert tools.console is console + + +def test_omnygui_show_omnycam_samplestage_uses_current_image_widget_api(): + tools, client = _make_gui_tools() + client.gui.windows = {"omny": mock.MagicMock()} + fig201 = mock.MagicMock() + fig202 = mock.MagicMock() + console = mock.MagicMock() + client.gui.omny.new.side_effect = [fig201, fig202, console] + + dev_mock = mock.MagicMock() + + with mock.patch(f"{GUI_TOOLS}.dev", dev_mock, create=True): + tools.omnygui_show_omnycam_samplestage() + + fig201.image.assert_called_once_with(device="cam201", signal="preview") + assert fig201.lock_aspect_ratio is True + dev_mock.cam201.start_live_mode.assert_called_once() + fig202.image.assert_called_once_with(device="cam202", signal="preview") + dev_mock.cam202.start_live_mode.assert_called_once() + assert tools.console is console