rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ruff formatting

Browse source
This commit is contained in:
jaknapper 2025-04-15 10:40:45 +01:00
parent ec25ae7126
commit 7373424fcf
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/openflexure_microscope_server/scan_planners.py
View file

@ -463,7 +463,7 @@ class ShortSmartSpiral(ScanPlanner):
return ( return (
moves_between(current_pos, pos, [self._dx, self._dy]), moves_between(current_pos, pos, [self._dx, self._dy]),
self.moves_from_centre(pos), self.moves_from_centre(pos),
distance_between(current_pos, pos) distance_between(current_pos, pos),
) )
self._remaining_locations.sort(key=sort_key) self._remaining_locations.sort(key=sort_key)
@ -503,10 +503,11 @@ def distance_between(
current_pos = np.array(current_pos, dtype="float64") current_pos = np.array(current_pos, dtype="float64")
return float(np.linalg.norm(next_pos - current_pos)) return float(np.linalg.norm(next_pos - current_pos))
def moves_between( def moves_between(
starting_pos: XYPos | np.ndarray, starting_pos: XYPos | np.ndarray,
ending_pos: XYPos | np.ndarray, ending_pos: XYPos | np.ndarray,
move_size: XYPos | np.ndarray | list[int, int] move_size: XYPos | np.ndarray | list[int, int],
) -> float: ) -> float:
""" """
Return the number of moves between two xy positions in the x or y direction Return the number of moves between two xy positions in the x or y direction