1076 fast cs eiger for xrc - #1807
Draft
rtuck99 wants to merge 22 commits into
Draft
Conversation
* Removed ConstructBeamlineSpecificFGSParams * Moved gridscan-related setup code into <beamline>/gridscan.py * Adding detector-specific modules to BeamlineSpecificFGSFeatures
Some system tests and unit tests fixed
Pin dodal to required branch
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## 1765_box_size_um #1807 +/- ##
====================================================
- Coverage 93.07% 93.05% -0.03%
====================================================
Files 163 170 +7
Lines 8958 9119 +161
====================================================
+ Hits 8338 8486 +148
- Misses 620 633 +13
🚀 New features to boost your workflow:
|
This file contains hidden or 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
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.
Refactoring that introduces ability to use arbitrary detector types.
Required for
Requires:
Link to dodal PR (if required):
Description of changes
This introduces a framework for detector-agnostic gridscans. Rotations are left largely unchanged and are hard-coded to still support classic ophyd v1
EigerDetector.BeamlineSpecificDetectorFeaturesis introduced as a customisation class akin toBeamlineSpecificFGSFeatures.Plans wishing to run diffraction plans will need to supply an instance which provides implementations for (pre)arming the detector, disarming the detector, cleanup, and also information about detector signals that should be read when generating events for callbacks. All detector-specific code is now invoked through this customisation class and the plans are largely detector agnostic.
BeamlineSpecificFGSFeaturesnow inherits from this class.construct_beamline_specific_features_xxxfunctions are now largely removed, and no longer passed around. Instead theBeamlineSpecificFGSFeaturesis constructed ahead of time, and is passed through the call chain.setup_trigger_planandset_flyscan_params_plannow takeGridScanParamsparameters so that we can construct the BSFGSF without needing to have performed grid detection.HWReadDuringMapperandZocaloHWReadEventMapperto be supplied on construction, to populate a device-agnostic payload.mx_bluesky.common.device_setup_plans.detector(Classic Eiger, FastCS Eiger)mx_bluesky.common.device_setup_plans.gridscan(Zebra 3D)mx_bluesky.hyperion.device_setup_plans.gridscan(Panda 3D)mx_bluesky.i02_1.device_setup_plans.gridscan(Zebra 2D)Future improvments
Protocols but for now they follow the existing patternInstructions to reviewer on how to test:
Checks for reviewer