From 8b92a283cfafa5d7e3446c7458e33e5169d4f53c Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Wed, 24 Jun 2026 12:51:11 +0200 Subject: [PATCH] test: add cont grid scan tests --- csaxs_bec/scans/scans_v4/cont_grid.py | 57 +++++---------------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/csaxs_bec/scans/scans_v4/cont_grid.py b/csaxs_bec/scans/scans_v4/cont_grid.py index 2863fbb..9ec1c38 100644 --- a/csaxs_bec/scans/scans_v4/cont_grid.py +++ b/csaxs_bec/scans/scans_v4/cont_grid.py @@ -75,58 +75,21 @@ class ContGrid(ScanBase): } def __init__( + # fmt: off self, - fast_axis: Annotated[ - DeviceBase, - ScanArgument(display_name="Fast Axis", description="Axis with continuous motion."), - ], - fast_start: Annotated[ - float, - ScanArgument( - display_name="Fast Start", - description="Start position for measurement points of the fast axis.", - ), - ], - fast_end: Annotated[ - float, - ScanArgument( - display_name="Fast End", - description="End position for measurement points of the fast axis.", - ), - ], - fast_step_size: Annotated[ - float, - ScanArgument( - display_name="Fast Step Size", - description="Step size for points of the continuous motion axis.", - ), - ], - stepper_axis: Annotated[ - DeviceBase, - ScanArgument( - display_name="Step Axis", - description="Step axis of the grid scan, stepping through the lines.", - ), - ], - stepper_start: Annotated[ - float, - ScanArgument(display_name="Step Start", description="Start position of the step axis."), - ], - stepper_stop: Annotated[ - float, - ScanArgument(display_name="Step Stop", description="End position of the step axis."), - ], - stepper_step_size: Annotated[ - float, - ScanArgument( - display_name="Step Step Size", - description="Step size of the step axis in units of the motor.", - ), - ], + fast_axis: Annotated[DeviceBase, ScanArgument(display_name="Fast Axis", description="Axis with continuous motion.")], + fast_start: Annotated[float, ScanArgument(display_name="Fast Start", description="Start position for measurement points of the fast axis.")], + fast_end: Annotated[float, ScanArgument(display_name="Fast End", description="End position for measurement points of the fast axis.")], + fast_step_size: Annotated[float, ScanArgument(display_name="Fast Step Size", description="Step size for points of the continuous motion axis.")], + stepper_axis: Annotated[DeviceBase, ScanArgument(display_name="Step Axis", description="Step axis of the grid scan, stepping through the lines.")], + stepper_start: Annotated[float, ScanArgument(display_name="Step Start", description="Start position of the step axis.")], + stepper_stop: Annotated[float, ScanArgument(display_name="Step Stop", description="End position of the step axis.")], + stepper_step_size: Annotated[float, ScanArgument(display_name="Step Step Size", description="Step size of the step axis in units of the motor.")], exp_time: DefaultArgType.ExposureTime, relative: DefaultArgType.Relative = False, fast_axis_always_in_pos_dir: bool = True, **kwargs, + # fmt: on ): """ Continuous grid scan with 2-axis. The scan requires the fast axis to properly implement base velocity as well as high velocity and high acceleration time