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

Renaming z_stack features for clarity, docstring on AutofocusThing

Browse source
This commit is contained in:
jaknapper 2025-04-25 12:09:08 +01:00
parent 9f39f61d03
commit bf6437b42c
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -146,6 +146,11 @@ class SharpnessDataArrays(BaseModel):
class AutofocusThing(Thing): class AutofocusThing(Thing):
"""The Thing concerned with combinations of z axis movements and the camera.
Actions here involve moving a stage in z, and using the camera to either
capture images (generally, z-stacking) and measuring the sharpness of the
field of view to assess focus (autofocus and testing the success of a z-stack)"""
@thing_action @thing_action
def fast_autofocus( def fast_autofocus(
self, self,
@ -177,7 +182,7 @@ class AutofocusThing(Thing):
return m.data_dict() return m.data_dict()
@thing_action @thing_action
def move_and_measure( def z_move_and_measure_sharpness(
self, self,
m: SharpnessMonitorDep, m: SharpnessMonitorDep,
dz: Sequence[int], dz: Sequence[int],
@ -261,14 +266,14 @@ class AutofocusThing(Thing):
return current_sharpness >= base + cutoff return current_sharpness >= base + cutoff
@thing_property @thing_property
def images_to_capture(self) -> int: def stack_images_to_capture(self) -> int:
"""The number of images to capture and save in a stack """The number of images to capture and save in a stack
Defaults to 1 unless you need to see either side of focus""" Defaults to 1 unless you need to see either side of focus"""
return self.thing_settings.get("images_to_capture", 1) return self.thing_settings.get("stack_images_to_capture", 1)
@images_to_capture.setter @stack_images_to_capture.setter
def images_to_capture(self, value: int) -> None: def stack_images_to_capture(self, value: int) -> None:
self.thing_settings["images_to_capture"] = value self.thing_settings["stack_images_to_capture"] = value
@thing_property @thing_property
def stack_dz(self) -> int: def stack_dz(self) -> int:
@ -318,9 +323,9 @@ class AutofocusThing(Thing):
stage.move_relative(z=stack_dz) stage.move_relative(z=stack_dz)
time.sleep(0.3) time.sleep(0.3)
self.copy_central_image(images_dir, stack_dir) self.copy_central_image_from_stack(images_dir, stack_dir)
def copy_central_image( def copy_central_image_from_stack(
self, self,
images_dir: str, images_dir: str,
stack_dir: str, stack_dir: str,