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

Apply suggestions from code review of branch equal-offsets

Browse source 
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
This commit is contained in:
Joe Knapper 2026-03-02 20:18:59 +00:00 • committed by Julian Stirling
parent 7d3427ad2a
commit c09164a4e3
2 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/unit_tests/test_scan_workflows.py
View file

@ -134,33 +134,28 @@ def test_histo_workflow_settings_generation(histo_workflow, mocker):
def test_histo_workflow_settings_generation_equal_overlap(histo_workflow, mocker):
"""Check the settings models generate as expected."""
"""Check that setting x and y equal behaves as expected."""
mocker.patch.object(
histo_workflow, "_calc_displacement_from_overlap", return_value=(123, 456)
)
histo_workflow.equal_distances = True
workflow_settings, stitching_settings = histo_workflow.all_settings("/this/img_dir")
## Check type
assert isinstance(workflow_settings, HistoScanSettingsModel)
assert isinstance(stitching_settings, StitchingSettings)
assert isinstance(workflow_settings.smart_stack_params, SmartStackParams)
# Check stitching defaults
assert stitching_settings.correlation_resize == 0.5
assert stitching_settings.overlap == 0.45
# Check some workflow defaults
assert workflow_settings.overlap == 0.45
assert workflow_settings.max_dist == 45000
assert workflow_settings.skip_background
assert workflow_settings.smart_stack_params.stack_dz == 50
assert workflow_settings.smart_stack_params.images_to_save == 1
assert workflow_settings.smart_stack_params.min_images_to_test == 9
# Check values from calculating overlap are as expected (from above mock)
# but are then set to the lesser of the two, as dx=dy was requested
# Different when False
histo_workflow.equal_distances = False
workflow_settings, _stitching_settings = histo_workflow.all_settings(
"/this/img_dir"
)
assert workflow_settings.dx == 123
assert workflow_settings.dy == 456
# Same when set True
histo_workflow.equal_distances = True
workflow_settings, _stitching_settings = histo_workflow.all_settings(
"/this/img_dir"
)
assert workflow_settings.dx == 123
assert workflow_settings.dy == 123
# And that the input image dir is passed to stack the stack parameter for saving
assert workflow_settings.capture_params.images_dir == "/this/img_dir"
# A CSM that is "normal" changing from camera maxtrix coordinates (y,x) to normal