This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
Rotation scan puts in correct comment to ispyb #1425
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
olliesilvester
changed the title
DominicOram
suggested changes
Jun 3, 2024
src/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py
Outdated
Show resolved
Hide resolved
tests/unit_tests/external_interaction/callbacks/rotation/test_ispyb_callback.py
Outdated
Show resolved
Hide resolved
| self.aperture_size = aperture_size | ||
|
|
||
| def construct_comment(self) -> str: | ||
| return f"Smargon XYZ positions: {self.motor_position} User comment: {self.user_comment} Aperture size: {self.aperture_size}" |
There was a problem hiding this comment.
Must: I think this is going to get a lot more verbose than the original. Maybe "Sample position: {self.motor_position} {self.user_comment} Aperture: {self.aperture_size}"
| @@ -87,7 +109,10 @@ def activity_gated_start(self, doc: RunStart): | |||
| self.params | |||
| ) | |||
| data_collection_info = populate_remaining_data_collection_info( | |||
| COMMENT_FOR_ROTATION_SCAN, dcgid, data_collection_info, self.params | |||
| self.rotation_comment.construct_comment(), | |||
There was a problem hiding this comment.
Should: It's a bit messy that this results in None in the comments to start. Could we just have this as self.params.comment? This will then also mean that we don't need to store a RotationIsPyBComment any more and can get rid of the class altogether.
src/hyperion/external_interaction/callbacks/rotation/ispyb_callback.py
Outdated
Show resolved
Hide resolved
Comment on lines
153
to
161
| info = scan_data_infos[0] | ||
| assert ( | ||
| info.data_collection_position_info | ||
| ), "Unable to find smargon motor position info" | ||
| motor_positions = [ | ||
| info.data_collection_position_info.pos_x, | ||
| info.data_collection_position_info.pos_y, | ||
| info.data_collection_position_info.pos_z, | ||
| ] |
There was a problem hiding this comment.
Could: I think getting these from the doc is maybe nicer? I'm not 100% convinced either way though
DominicOram
approved these changes
Jun 10, 2024
olliesilvester
added a commit
to olliesilvester/mx-bluesky
that referenced
this pull request
Aug 23, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #933
Link to dodal PR (if required): #XXX
(remember to update
setup.cfgwith the dodal commit tag if you need it for tests to pass!)To test: