usov_i-org/bec
1
0
Fork 0
mirror of https://github.com/ivan-usov-org/bec.git synced 2025-04-21 18:20:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: added type hints for optim_trajectory; closes #117

Browse Source
This commit is contained in:
wakonig_k 2023-11-18 11:44:17 +01:00
parent c47a46f049
commit 968960646c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scan_server/scan_server/scans.py
View File

@ -2,12 +2,10 @@ import ast
import enum
import time
from abc import ABC, abstractmethod
from typing import Any, Dict, List
from bec_lib import messages
from typing import Any, Dict, List, Literal
import numpy as np
from bec_lib import DeviceManagerBase, MessageEndpoints, bec_logger
from bec_lib import DeviceManagerBase, MessageEndpoints, bec_logger, messages
from .errors import LimitError, ScanAbortion
from .path_optimization import PathOptimizerMixin
@ -267,7 +265,8 @@ class RequestBase(ABC):
pos_axis = pos[ii]
if not low_limit <= pos_axis <= high_limit:
raise LimitError(
f"Target position {pos} for motor {dev} is outside of range: [{low_limit}, {high_limit}]"
f"Target position {pos} for motor {dev} is outside of range: [{low_limit},"
f" {high_limit}]"
)
def _get_scan_motors(self):
@ -354,7 +353,7 @@ class ScanBase(RequestBase, PathOptimizerMixin):
relative: bool = False,
burst_at_each_point: int = 1,
frames_per_trigger: int = 1,
optim_trajectory: str = None,
optim_trajectory: Literal["corridor", None] = None,
monitored: list = None,
metadata: dict = None,
**kwargs,
@ -815,7 +814,7 @@ class FermatSpiralScan(ScanBase):
relative: bool = False,
burst_at_each_point: int = 1,
spiral_type: float = 0,
optim_trajectory: str = None,
optim_trajectory: Literal["corridor", None] = None,
**kwargs,
):
"""