Add Jungfrau rotation scan plan #1234
Conversation
…ce/mx-bluesky into 1200_add_basic_jf_plans
| default=DetectorParamConstants.BEAM_XY_LUT_PATH | ||
| ) | ||
| insertion_prefix: str = "SR03S" if TEST_MODE else "SR03I" | ||
| insertion_prefix: str = ( |
There was a problem hiding this comment.
This leads to a lot of ugliness. We shouldn't be initialising the beamline name in here on module load. The logic setting this also seems highly suspect.
What do we even use insertion_prefix for? I can't find anything in the code. Can we get rid of it?
There was a problem hiding this comment.
Hmm, yeah, it looks like we don't actually use insertion_prefix anywhere, even though all the hyperion test parameters have them as an input. I'll try removing them
src/mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/rotation_scan_plan.py
Outdated
Show resolved
Hide resolved
src/mx_bluesky/beamlines/i24/jungfrau_commissioning/experiment_plans/rotation_scan_plan.py
Show resolved
Hide resolved
| "scan_points": [params.scan_points], | ||
| "rotation_scan_params": params.model_dump_json(), | ||
| } | ||
| ) |
There was a problem hiding this comment.
I think this should be moved out to its own function as we've got too many levels of nesting here
There was a problem hiding this comment.
Can we discuss this maybe? I agree that the nesting is hard to read, but it tends to happen a lot just because of Bluesky's heavy use of decorators. I think the nesting may still be nicer than having multiple separate functions which are all basically called rotation_scan. Open to suggestions though
| @@ -0,0 +1,126 @@ | |||
| import asyncio | |||
There was a problem hiding this comment.
Is this supposed to be replacing test_do_darks.py in i24.jungrfrau_commissioning or is this another merge snafu?
|
@olliesilvester will integrate @ndevenish's path provider for now with an aim to get this merged ASAP |
…urce/mx-bluesky into 1200_add_jf_rotation_plan
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #1234 +/- ##
==========================================
+ Coverage 92.29% 92.47% +0.18%
==========================================
Files 142 148 +6
Lines 8094 8280 +186
==========================================
+ Hits 7470 7657 +187
+ Misses 624 623 -1
🚀 New features to boost your workflow:
|
Part of #1200
Prerequisites for CI to pass: DiamondLightSource/dodal#1721
Instructions to reviewer on how to test:
Checks for reviewer