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

Ophyd pin-tip centring #938

Merged
merged 12 commits into from
Jan 23, 2024
Merged

Ophyd pin-tip centring #938

merged 12 commits into from
Jan 23, 2024

Conversation

Tom-Willemsen
Copy link
Contributor

@Tom-Willemsen Tom-Willemsen commented Oct 17, 2023

Requires DiamondLightSource/dodal#289

Provide support for running both Ophyd + AD MXSC pin tip centring workflows in hyperion.

To test:

@DominicOram
Copy link
Collaborator

DominicOram commented Oct 24, 2023

Tested on beamline today. Broadly works but need to:

  • Tidy up
  • Direction is written in the JSON as 0, this expects +1 or -1
  • Set the PVA plugin to look at PROC when at ZOOM 1, we won't need to do this if we get https://jira.diamond.ac.uk/browse/I03-912 done
  • Allow turning this on to be user settable
  • New issue - write a snapshot to file if no pin tip was found (must the same frame that was used for detection)
  • Potentially new issue - use this device for the grid detection too

@Tom-Willemsen
Copy link
Contributor Author

Handed over to @dperl-dls .

@DominicOram
Copy link
Collaborator

I'll pick this up now so that @dperl-dls can focus on rotation scan stuff

Copy link

codecov bot commented Jan 11, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (d1e2d97) 93.35% compared to head (3dff9a9) 93.80%.
Report is 7 commits behind head on main.

❗ Current head 3dff9a9 differs from pull request most recent head aadbfa5. Consider uploading reports for the commit aadbfa5 to get more accurate results

Files Patch % Lines
...hyperion/experiment_plans/pin_tip_centring_plan.py 90.90% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #938      +/-   ##
==========================================
+ Coverage   93.35%   93.80%   +0.44%     
==========================================
  Files          62       58       -4     
  Lines        2921     2759     -162     
==========================================
- Hits         2727     2588     -139     
+ Misses        194      171      -23     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DominicOram DominicOram changed the title [do not merge] Ophyd pin-tip centring Ophyd pin-tip centring Jan 14, 2024
@DominicOram DominicOram marked this pull request as ready for review January 14, 2024 21:49
Copy link
Collaborator

@dperl-dls dperl-dls left a comment

Choose a reason for hiding this comment

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

Looks good, thanks for tidying this up


LOGGER.info("Pin tip not found, waiting a second and trying again")

if found_tip == ophyd_pin_tip_detection.INVALID_POSITION:
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do I understand correctly that this will be adressed in #1069?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yep

@DominicOram DominicOram force-pushed the allow_using_new_pin_tip_centring branch from 23a5dca to aadbfa5 Compare January 23, 2024 17:23
@DominicOram DominicOram merged commit 74545ae into main Jan 23, 2024
4 checks passed
@DominicOram DominicOram deleted the allow_using_new_pin_tip_centring branch January 23, 2024 17:27
olliesilvester pushed a commit to olliesilvester/mx-bluesky that referenced this pull request Aug 23, 2024
…ource/allow_using_new_pin_tip_centring

Ophyd pin-tip centring
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