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

More refactoring

Browse source
This commit is contained in:
Chish36 2025-07-31 15:17:38 +01:00 • committed by Julian Stirling
parent 024c74f67b
commit f501e7741d
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/openflexure_microscope_server/things/stage_measure.py
View file

@ -135,7 +135,6 @@ def _move_and_measure(
return offset, wrong_axis return offset, wrong_axis
def _acquire_z_predict_points( def _acquire_z_predict_points(
stream_resolution: list[int], stream_resolution: list[int],
direction: Literal[1, -1], direction: Literal[1, -1],
@ -217,9 +216,6 @@ def _check_stage_operation(
Delta is updated and tracked after each move. Delta is updated and tracked after each move.
""" """
failure_count = 0 failure_count = 0
wrong_axis_max_small = _generate_move_dicts(
small_step, stream_resolution, direction, factor=0.1
) # Dictionary with maximum allowed parasitic motion
for _loop in range(3): for _loop in range(3):
image1 = cv2.resize( image1 = cv2.resize(
@ -269,7 +265,15 @@ def _check_stage_operation(
data.measure(stage.position, offset) data.measure(stage.position, offset)
assert np.abs(data.delta[wrong_axis]) < np.abs(wrong_axis_max_small[wrong_axis]) assert np.abs(data.delta[wrong_axis]) < np.abs(
_generate_move_dicts(
small_step,
stream_resolution,
direction,
factor=0.1)[
wrong_axis
]
)
# this means the edge has been found # this means the edge has been found
if np.abs(data.delta[axis]) < np.abs(minimum_offset_small[axis]): if np.abs(data.delta[axis]) < np.abs(minimum_offset_small[axis]):
@ -396,7 +400,8 @@ class RangeofMotionThing(lt.Thing):
try: try:
logger.info( logger.info(
f"Beginning the {axis}-axis in the {'positive' if direction == 1 else 'negative'} direction" f"Beginning the {axis}-axis in the {'positive' if direction == 1 else 'negative'}\
direction"
) )
# Generate required dictionaries for step sizes and minimum offsets # Generate required dictionaries for step sizes and minimum offsets