add more peakPositons for it to move to after scan

src/i10_bluesky/plans/utils/alignments.py

@@ -11,9 +11,15 @@
 from p99_bluesky.plans.fast_scan import fast_scan_1d
 
 
-class PeakPosition(int, Enum):
-    COM = 2
-    CEN = 3
+class PeakPosition(tuple, Enum):
+    COM = ("stats", "com")
+    CEN = ("stats", "cen")
+    MIN = ("stats", "min")
+    MAX = ("stats", "max")
+    D_COM = ("derivative_stats", "com")
+    D_CEN = ("derivative_stats", "cen")
+    D_MIN = ("derivative_stats", "min")
+    D_MAX = ("derivative_stats", "max")
 
 
 def scan_and_move_cen(funcs) -> Callable:
@@ -23,12 +29,19 @@ def inner(**kwargs):
             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)
+        print(ps)
+        peak_position = get_stat_loc(ps, kwargs["loc"])
+        if (
+            kwargs["start"] >= peak_position >= kwargs["end"]
+            or kwargs["start"] <= peak_position <= kwargs["end"]
+        ):
+            yield from abs_set(kwargs["motor"], peak_position, wait=True)
+        else:
+            raise ValueError(f"New position ({peak_position}) is outside scan range.")
 
     return inner
 
@@ -55,3 +68,9 @@ def fast_scan_and_move_cen(
     loc: PeakPosition = PeakPosition.CEN,
 ) -> MsgGenerator:
     return fast_scan_1d([det], motor, start, end, motor_speed=motor_speed)
+
+
+def get_stat_loc(ps: PeakStats, loc: PeakPosition) -> float:
+    stat = getattr(ps, loc.value[0])
+    stat_pos = getattr(stat, loc.value[1])
+    return stat_pos if isinstance(stat_pos, float) else stat_pos[0]