i13-1 merlin test initial commit

[huw-dls]

Feature (not fix)

Instructions to reviewer on how to test:

merlin_controller will be finished after testing on i13-1.
The merlin device will then be moved from i13-1 to the top-level devices directory under merlin/.

Checks for reviewer

• Would the PR title make sense to a scientist on a set of release notes
• If a new device has been added does it follow the standards
• If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
• Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

[callumforrester]

@huw-dls this looks good! I think it will work, I ran the system tests (dodal connect i13-1) and the detector found the PVs okay. That command uses the same code as blueapi to pick up devices so that should also work.

The problem is that this code is not loaded into your beamline module at /dls_sw/i13-1/epics/scratch/dodal/src/dodal/beamlines/i13_1.py, I would suggest we get this merged and then just checkout the main branch in that location, so you have an up-to-date dodal and Merlin to play with. See the issues I've raised they are very minor.

Additional nit: Please remove the commented-out extra lines before merging.

[callumforrester]

@huw-dls I think the rebase has gone wrong somewhere, the diff shouldn't have all of those extraneous changes in it, what I normally do:

git checkout main
git pull
git checkout <my branch>
git rebase main

Then work through the conflicts until it is happy

[callumforrester]

@huw-dls Happy to approve once CI passes

[callumforrester]

Feature (not fix)

@huw-dls quick note: I know it says "fixes" but that's just a Github shorthand for "please automatically close this issue/ticket when this is merged", we also use it for features. In general we try to write an issue for almost everything we do (can except quick patches and similar)

[codecov]

Codecov Report

Attention: Patch coverage is 98.11321% with 1 line in your changes missing coverage. Please review.

Project coverage is 97.48%. Comparing base (bbd76c6) to head (daed185).
Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
src/dodal/devices/i13_1/merlin_controller.py	96.00%	1 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #965   +/-   ##
=======================================
  Coverage   97.48%   97.48%           
=======================================
  Files         148      151    +3     
  Lines        6238     6290   +52     
=======================================
+ Hits         6081     6132   +51     
- Misses        157      158    +1     

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

[callumforrester]

@huw-dls This is looking good and almost done. The new devices need tests to keep the coverage happy. This is an important way to prevent the buildup of dead code. Have a look at tests for similar devices, they are small so shouldn't be too hard to test.

[callumforrester]

LGTM

[DominicOram]

I know it says "fixes" but that's just a Github shorthand for "please automatically close this issue/ticket when this is merged", we also use it for features.

FYI, if you prefer Closes also works instead of Fixes https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue