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

Fix some final type issues in Autofocus

Browse source
This commit is contained in:
Julian Stirling 2025-12-19 16:52:47 +00:00
parent 141ccc06c1
commit c1ad445517
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/openflexure_microscope_server/things/autofocus.py
View file

@ -148,7 +148,7 @@ class CaptureInfo:
"""The information from a capture in a z_stack.""" """The information from a capture in a z_stack."""
buffer_id: int buffer_id: int
position: dict[str, int] position: Mapping[str, int]
sharpness: int sharpness: int
@property @property
@ -426,7 +426,7 @@ class AutofocusThing(lt.Thing):
while attempt < 10: while attempt < 10:
attempt += 1 attempt += 1
if start == "centre": if start == "centre":
self._stage.move_relative(x=0, y=0, z=-(backlash + dz / 2)) self._stage.move_relative(x=0, y=0, z=-int(backlash + dz / 2))
self._stage.move_relative(x=0, y=0, z=backlash) self._stage.move_relative(x=0, y=0, z=backlash)
# Always start centrally for future runs # Always start centrally for future runs
@ -612,7 +612,7 @@ class AutofocusThing(lt.Thing):
def reset_stack( def reset_stack(
self, self,
initial_z_pos: list[int], initial_z_pos: int,
autofocus_dz: int, autofocus_dz: int,
) -> None: ) -> None:
"""Return to the initial z position and run a looping autofocus. """Return to the initial z position and run a looping autofocus.
@ -629,7 +629,7 @@ class AutofocusThing(lt.Thing):
def save_stack( def save_stack(
self, self,
sharpest_id: int, sharpest_id: int,
captures: list[list], captures: list[CaptureInfo],
stack_parameters: StackParams, stack_parameters: StackParams,
) -> int: ) -> int:
"""Save the required captures to disk. """Save the required captures to disk.
@ -681,7 +681,7 @@ class AutofocusThing(lt.Thing):
# Move down by the height of the z stack, plus an overshoot # Move down by the height of the z stack, plus an overshoot
# Better to start too low and take too many images than too high and need to refocus # Better to start too low and take too many images than too high and need to refocus
self._stage.move_relative( self._stage.move_relative(
z=-( z=-int(
stack_parameters.steps_undershoot stack_parameters.steps_undershoot
+ stack_parameters.backlash_correction + stack_parameters.backlash_correction
+ stack_parameters.stack_z_range / 2 + stack_parameters.stack_z_range / 2
@ -689,7 +689,7 @@ class AutofocusThing(lt.Thing):
) )
self._stage.move_relative(z=stack_parameters.backlash_correction) self._stage.move_relative(z=stack_parameters.backlash_correction)
captures = [] captures: list[CaptureInfo] = []
# Always check for focus using the the last `min_images_to_test` in the # Always check for focus using the the last `min_images_to_test` in the
# stack so check is fair # stack so check is fair
ims_to_check = slice(-stack_parameters.min_images_to_test, None) ims_to_check = slice(-stack_parameters.min_images_to_test, None)