Get moveonclick to work
#194
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
noemifrisina
changed the title
moveonclickmoveonclick to work
DominicOram
requested changes
Sep 4, 2024
Comment on lines
54
to
60
| zoomcalibrator = RE(_calculate_zoom_calibrator(oav)).plan_result # type: ignore | ||
| xmove = -1 * (beamX - x) * zoomcalibrator | ||
| ymove = -1 * (beamY - y) * zoomcalibrator | ||
| logger.info(f"Moving X and Y {xmove} {ymove}") | ||
| xmovepmacstring = "#1J:" + str(xmove) | ||
| ymovepmacstring = "#2J:" + str(ymove) | ||
| yield from bps.abs_set(pmac.pmac_string, xmovepmacstring, wait=True) | ||
| yield from bps.abs_set(pmac.pmac_string, ymovepmacstring, wait=True) | ||
| RE(_move_to_position(pmac, xmovepmacstring, ymovepmacstring)) |
There was a problem hiding this comment.
Should: Instead of calling the run engine twice we could just have a plan that calculates the zoom calibration then moves
DominicOram
requested changes
Sep 6, 2024
Comment on lines
+61
to
+62
| yield from bps.abs_set(pmac.pmac_string, xmovepmacstring, wait=True) | ||
| yield from bps.abs_set(pmac.pmac_string, ymovepmacstring, wait=True) |
There was a problem hiding this comment.
Should: Can you either use _move_to_position here or remove the unused function?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Multiple
moveonclickfixes/changes:zoomcalibratorfrom fitting curve: so far this value has been fixed to an empirically determined constant that didn't work well for all zoom levels. This adds a way to work out a correct value depending on the zoom level currently in use. Closes I24 SSX: Take into account zoom in click to move #44yield from bps.abs_set(pmac.pmac_string, ymovepmacstring, wait=True)inonMousemade it a generator, which couldn't work insetMouseCallback