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

Merge branch 'reverse_csm_order' into 'v3'

Browse source 
Swapped the order of CSM so y axis is completed first

See merge request openflexure/openflexure-microscope-server!285
This commit is contained in:
Julian Stirling 2025-06-09 13:39:06 +00:00
commit 80b6fd088d
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/openflexure_microscope_server/things/camera_stage_mapping.py
View file

@ -228,10 +228,12 @@ class CameraStageMapper(Thing):
This performs two 1d calibrations in x and y, then combines their results.
"""
logger.info("Calibrating X axis:")
cal_x: dict = self.calibrate_1d(hw, stage, logger, (1, 0, 0))
# Calibrate y-axis first as it is more likely to fail.
# The x-y difference is due to the camera aspect ratio, not the stage hardware.
logger.info("Calibrating Y axis:")
cal_y: dict = self.calibrate_1d(hw, stage, logger, (0, 1, 0))
logger.info("Calibrating X axis:")
cal_x: dict = self.calibrate_1d(hw, stage, logger, (1, 0, 0))
logger.info("Calibration complete, updating metadata.")
# Combine X and Y calibrations to make a 2D calibration