Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Make common FGS and convert to ophyd async #1294

Merged
merged 10 commits into from
Jun 11, 2024

Conversation

olliesilvester
Copy link
Contributor

@olliesilvester olliesilvester commented Apr 5, 2024

Fixes dodal #413

Link to dodal PR (if required): #422
(remember to update setup.cfg with the dodal commit tag if you need it for tests to pass!)

After this is merged, we should be able to combine the flyscan_xray_centre and panda_flyscan_xray_centre plans

To test:

  1. Confirm functionality is unchanged

@olliesilvester olliesilvester changed the title Dodal 413 make common fgs Make common FGS and convert to ophyd async Apr 5, 2024
@olliesilvester olliesilvester marked this pull request as ready for review April 10, 2024 12:07
@@ -589,8 +590,12 @@ def fake_fgs_composite(
False
)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is to be invoked separately from future tests and this commented out code can be removed?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still agree that this commented out code needs to go

@olliesilvester olliesilvester force-pushed the dodal_413_make_common_fgs branch from f25fc01 to a3cb801 Compare April 26, 2024 14:14
@olliesilvester olliesilvester marked this pull request as draft April 26, 2024 14:45
@olliesilvester olliesilvester force-pushed the dodal_413_make_common_fgs branch from 5b39279 to 89ef0da Compare May 2, 2024 10:10
@olliesilvester olliesilvester marked this pull request as ready for review May 2, 2024 10:15
@olliesilvester olliesilvester requested a review from rtuck99 May 7, 2024 13:09
@olliesilvester olliesilvester force-pushed the dodal_413_make_common_fgs branch from da6b590 to 60a1298 Compare May 15, 2024 15:32
Copy link
Contributor

@rtuck99 rtuck99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All ok - apart from comment re commented out code

Copy link
Collaborator

@DominicOram DominicOram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the one comment, thanks!

@@ -589,8 +590,12 @@ def fake_fgs_composite(
False
)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still agree that this commented out code needs to go

Copy link
Collaborator

@DominicOram DominicOram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thank you!

@olliesilvester olliesilvester merged commit 35a6910 into main Jun 11, 2024
6 checks passed
@olliesilvester olliesilvester deleted the dodal_413_make_common_fgs branch June 11, 2024 07:33
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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants