Skip to content
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

Jump to bottom

Update from beamline test 14102024 #571

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update from beamline test 14102024 #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58015d5
Update cs parameter file
noemifrisina Oct 15, 2024
c0a5b03
Change y direction in moveonclick. Again.
noemifrisina Oct 15, 2024
1c77e1e
And fix test
noemifrisina Oct 15, 2024
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
2 changes: 1 addition & 1 deletion src/mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _move_on_mouse_click_plan(
beamX, beamY = yield from _get_beam_centre(oav)
x, y = clicked_position
xmove = -1 * (beamX - x) * zoomcalibrator
ymove = -1 * (beamY - y) * zoomcalibrator
ymove = 1 * (beamY - y) * zoomcalibrator
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, the theory is that this may be due to the rotation of the grid. Could you make an issue to investigate the reasoning behind this and find a way to fix it permanently please?

logger.info(f"Moving X and Y {xmove} {ymove}")
xmovepmacstring = "#1J:" + str(xmove)
ymovepmacstring = "#2J:" + str(ymove)
Expand Down
6 changes: 3 additions & 3 deletions src/mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"scalex": 10004.0,
"scaley": 10005.2,
"scalex": 10004.7,
"scaley": 10004.4,
"scalez": 10000.0,
"skew": -0.01,
"skew": 0.120,
"Sx_dir": 1,
"Sy_dir": 1,
"Sz_dir": 1
Expand Down
6 changes: 3 additions & 3 deletions tests/unit_tests/beamlines/i24/serial/fixed_target/test_moveonclick.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ def fake_generator(value):
(
(15, 10),
"#1J:-" + str(15 * ZOOMCALIBRATOR),
"#2J:-" + str(10 * ZOOMCALIBRATOR),
"#2J:" + str(10 * ZOOMCALIBRATOR),
),
(
(475, 309),
"#1J:-" + str(475 * ZOOMCALIBRATOR),
"#2J:-" + str(309 * ZOOMCALIBRATOR),
"#2J:" + str(309 * ZOOMCALIBRATOR),
),
(
(638, 392),
"#1J:-" + str(638 * ZOOMCALIBRATOR),
"#2J:-" + str(392 * ZOOMCALIBRATOR),
"#2J:" + str(392 * ZOOMCALIBRATOR),
),
],
)
Expand Down