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

Apply flatfield by default when changing zoom level#758

Merged
DominicOram merged 10 commits into
mainfrom
dodal_103_apply_flatfield
Jul 5, 2023
Merged

Apply flatfield by default when changing zoom level#758
DominicOram merged 10 commits into
mainfrom
dodal_103_apply_flatfield

Conversation

@DominicOram

Copy link
Copy Markdown
Collaborator

Fixes DiamondLightSource/dodal#103

This mainly just removes the need for Artemis to set the plugins for the OAV as this is handled inside the device when zoom level is changed

Link to dodal PR (if required): DiamondLightSource/dodal#104

To test:

  1. Confirm tests still pass

@noemifrisina

Copy link
Copy Markdown
Contributor

Merge conflict to be addressed before merging

@DominicOram
DominicOram requested a review from noemifrisina June 30, 2023 11:46

@noemifrisina noemifrisina left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It looks like the failing tests are due to changes in Pydantic v2, which was just released.

I think we could pin the pydantic version to pydantic<2.0 in setup.cfg for this one and fix the issue in a separate PR

@DominicOram

Copy link
Copy Markdown
Collaborator Author

Broken test is due to #763

@DominicOram
DominicOram requested a review from noemifrisina July 4, 2023 15:17

@noemifrisina noemifrisina left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks, looks okay aside from merge conflict

@DominicOram
DominicOram merged commit e3a8dbe into main Jul 5, 2023
@DominicOram
DominicOram deleted the dodal_103_apply_flatfield branch July 5, 2023 16:23
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.

OAV device should apply flatfield on zoom set to 1

2 participants