added alignments plans

.github/workflows/ci.yml

@@ -33,6 +33,14 @@ jobs:
       python-version: ${{ matrix.python-version }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  container:
+    needs: check
+    if: needs.check.outputs.branch-pr == ''
+    uses: ./.github/workflows/_container.yml
+    permissions:
+      contents: read
+      packages: write
   docs:
     needs: check
     if: needs.check.outputs.branch-pr == ''

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml

pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "dls-dodal",
     "ophyd-async",
     "bluesky",
+    "p99_bluesky",
 
 
     #usefull stuff for testing or running without blue api

src/i10_bluesky/plans/align_slits.py

@@ -0,0 +1,41 @@
+# from enum import Enum
+
+# from bluesky import preprocessors as bpp
+# from bluesky.callbacks.fitting import PeakStats
+# from bluesky.plan_stubs import abs_set
+# from bluesky.plans import scan
+# from dodal.common.types import MsgGenerator
+# from dodal.devices.i10.slits import I10Slits
+# from ophyd_async.core import StandardReadable
+# from ophyd_async.epics.motor import Motor
+
+
+# class PeakPosition(int, Enum):
+#     COM = 2
+#     CEN = 3
+
+
+# def scan_and_move(
+#     det: StandardReadable,
+#     motor: Motor,
+#     start: float,
+#     end: float,
+#     num: int,
+#     loc: PeakPosition = PeakPosition.CEN,
+# ) -> MsgGenerator:
+#     ps = yield from find_peak_centre(
+#         motor=motor, det=det, start=start, end=end, num=num
+#     )
+#     yield from abs_set(motor, ps["stats"][loc], wait=True)
+
+
+# def find_peak_centre(
+#     det: StandardReadable, motor: Motor, start: float, end: float, num: int
+# ) -> MsgGenerator:
+#     ps = PeakStats(f"{motor.name}", f"{det.name}")
+
+#     yield from bpp.subs_wrapper(
+#         scan([det], motor, start, end, num=num),
+#         ps,
+#     )
+#     return ps

src/i10_bluesky/plans/utils/__init__.py

@@ -0,0 +1,3 @@
+from .alignments import PeakPosition, fast_scan_and_move_cen, scan_and_move_cen
+
+__all__ = ["fast_scan_and_move_cen", "scan_and_move_cen", "PeakPosition"]

src/i10_bluesky/plans/utils/alignments.py

@@ -0,0 +1,57 @@
+from collections.abc import Callable
+from enum import Enum
+
+from bluesky import preprocessors as bpp
+from bluesky.callbacks.fitting import PeakStats
+from bluesky.plan_stubs import abs_set
+from bluesky.plans import scan
+from dodal.common.types import MsgGenerator
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+from p99_bluesky.plans.fast_scan import fast_scan_1d
+
+
+class PeakPosition(int, Enum):
+    COM = 2
+    CEN = 3
+
+
+def scan_and_move_cen(funcs) -> Callable:
+    def inner(**kwargs):
+        ps = PeakStats(
+            f"{kwargs['motor'].name}",
+            f"{kwargs['det'].name}",
+            calc_derivative_and_stats=True,
+        )
+
+        yield from bpp.subs_wrapper(
+            funcs(**kwargs),
+            ps,
+        )
+        yield from abs_set(kwargs["motor"], ps["stats"][kwargs["loc"]], wait=True)
+
+    return inner
+
+
+@scan_and_move_cen
+def step_scan_and_move_cen(
+    det: StandardReadable,
+    motor: Motor,
+    start: float,
+    end: float,
+    num: int,
+    loc: PeakPosition = PeakPosition.CEN,
+) -> MsgGenerator:
+    return scan([det], motor, start, end, num=num)
+
+
+@scan_and_move_cen
+def fast_scan_and_move_cen(
+    det: StandardReadable,
+    motor: Motor,
+    start: float,
+    end: float,
+    motor_speed: float | None = None,
+    loc: PeakPosition = PeakPosition.CEN,
+) -> MsgGenerator:
+    return fast_scan_1d([det], motor, start, end, motor_speed=motor_speed)