diff --git a/csaxs_bec/scans/__init__.py b/csaxs_bec/scans/__init__.py index f4aad14..ed42022 100644 --- a/csaxs_bec/scans/__init__.py +++ b/csaxs_bec/scans/__init__.py @@ -5,5 +5,6 @@ from .lamni_fermat_scan_v4 import LamniFermatScanV4 from .lamni_move_to_scan_center import LamniMoveToScanCenter from .LamNIFermatScan import LamNIFermatScan, LamNIMoveToScanCenter from .omny_fermat_scan import OMNYFermatScan +from .omny_fermat_scan_v4 import OmnyFermatScanV4 from .owis_grid import OwisGrid from .sgalil_grid import SgalilGrid diff --git a/csaxs_bec/scans/lamni_fermat_scan_v4.py b/csaxs_bec/scans/lamni_fermat_scan_v4.py index 5c9b638..a69d6d1 100644 --- a/csaxs_bec/scans/lamni_fermat_scan_v4.py +++ b/csaxs_bec/scans/lamni_fermat_scan_v4.py @@ -371,6 +371,8 @@ class LamniFermatScanV4(ScanBase): -np.sin(alpha) * stage_x_with_stitch + np.cos(alpha) * stage_y_with_stitch ) + # FIXME: We are checking stage_x_rot vs fovy. This needs to be clarified if this is correct + # once LamNI is back in operation. We keep it like this for now. return ( np.abs(stage_x_rot) <= (self.fovy / 2) and np.abs(stage_y_rot) <= (self.fovx / 2) diff --git a/csaxs_bec/scans/lamni_move_to_scan_center.py b/csaxs_bec/scans/lamni_move_to_scan_center.py index 36407fc..bb9d7c6 100644 --- a/csaxs_bec/scans/lamni_move_to_scan_center.py +++ b/csaxs_bec/scans/lamni_move_to_scan_center.py @@ -42,17 +42,13 @@ class LamniMoveToScanCenter(ScanBase): gui_config = {"Scan Parameters": ["shift_x", "shift_y", "angle"]} def __init__( + # fmt: off self, - shift_x: Annotated[ - float, ScanArgument(display_name="Shift X", description="Shift x.", units=Units.mm) - ], - shift_y: Annotated[ - float, ScanArgument(display_name="Shift Y", description="Shift y.", units=Units.mm) - ], - angle: Annotated[ - float, ScanArgument(display_name="Angle", description="Angle.", units=Units.deg) - ], + shift_x: Annotated[float, ScanArgument(display_name="Shift X", description="Shift x.", units=Units.mm)], + shift_y: Annotated[float, ScanArgument(display_name="Shift Y", description="Shift y.", units=Units.mm)], + angle: Annotated[float, ScanArgument(display_name="Angle", description="Angle.", units=Units.deg)], **kwargs, + # fmt: on ): """ LamNI scan to move the interferometer to the computed scan center based on the provided shift and angle.