This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
Use new params in XrayCentre #1331
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
d-perl
force-pushed
the
1275_use_new_params_in_gridscan
branch
from
20b250b to
d409e11
Compare
rtuck99
reviewed
Apr 30, 2024
| "exposure_time_s": 0.1, | ||
| "set_stub_offsets": true, | ||
| "ispyb_extras": { | ||
| "microns_per_pixel_x": 1.25, |
There was a problem hiding this comment.
Ditto comments in previous PR re microns_per_pixel
DominicOram
suggested changes
May 13, 2024
Comment on lines
13
to
27
| class GridParamUpdate(TypedDict): | ||
| transmission_frac: float | ||
| exposure_time_s: float | ||
| x_start_um: float | ||
| y_start_um: float | ||
| y2_start_um: float | ||
| z_start_um: float | ||
| z2_start_um: float | ||
| x_steps: int | ||
| y_steps: int | ||
| z_steps: int | ||
| x_step_size_um: float | ||
| y_step_size_um: float | ||
| z_step_size_um: float | ||
| set_stub_offsets: bool |
There was a problem hiding this comment.
Should: Some of these parameters don't change from the grid detection so I don't think we need to have them in here at all. I can't see any reasonable way that we would want to change them based on an optical detection in the near future either:
set_stub_offsetstransmission_fracexposure_time_s
| z_step_size_um: float | ||
| set_stub_offsets: bool | ||
|
|
||
|
|
||
| class GridDetectionCallback(CallbackBase): |
There was a problem hiding this comment.
Should: I don't think run_up_distance_mm is ever used here now so we can remove
src/hyperion/parameters/gridscan.py
Outdated
| @@ -94,6 +97,7 @@ def detector_params(self): | |||
| ), "Detector distance must be filled before generating DetectorParams" | |||
| os.makedirs(self.storage_directory, exist_ok=True) | |||
| return DetectorParams( | |||
| detector_size_constants=self.detector, # type: ignore | |||
There was a problem hiding this comment.
Could: Can you put a comment here that this should get tidied by #1307
DominicOram
approved these changes
May 14, 2024
olliesilvester
pushed a commit
to olliesilvester/mx-bluesky
that referenced
this pull request
Aug 23, 2024
…Source/1275_use_new_params_in_gridscan Use new params in XrayCentre
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.
Building on #1330 uses the new params for the xraycentre plans
Towards #1289
To test: