Skip to content

Replaced call to beamline.get_beam_info with calls to Beam HardwareObject #1856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2025
Merged

Replaced call to beamline.get_beam_info with calls to Beam HardwareObject #1856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions mxcubeweb/core/components/sampleview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,17 +285,16 @@ def update_shapes(self, shapes):
# Store pixels per mm for third party software, to facilitate
# certain calculations

beam_info_dict = self.app.beamline.get_beam_info()

shape_data["pixels_per_mm"] = (
HWR.beamline.diffractometer.get_pixels_per_mm()
)

shape_data["beam_pos"] = (
beam_info_dict.get("position")[0],
beam_info_dict.get("position")[1],
HWR.beamline.beam.get_beam_position_on_screen()[0],
HWR.beamline.beam.get_beam_position_on_screen()[1],
)
shape_data["beam_width"] = beam_info_dict.get("size_x", 0)
shape_data["beam_height"] = beam_info_dict.get("size_y", 0)
shape_data["beam_width"] = HWR.beamline.beam.get_value()[0]
shape_data["beam_height"] = HWR.beamline.beam.get_value()[1]

# Shape does not have any refs, create a new Centered position
if not refs:
Expand Down