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

Merge branch 'simplify-csm-interface' into 'v3'

Browse source 
Add camera-stage-mapping compliant functions to BaseStage and BaseCamera.

Closes #346 and #476

See merge request openflexure/openflexure-microscope-server!326
This commit is contained in:
Julian Stirling 2025-07-14 16:36:04 +00:00
commit c9c8a89236
7 changed files with 153 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/test_dummy_server.py
View file

@ -24,9 +24,6 @@ from openflexure_microscope_server.things.camera.simulation import SimulatedCame
from openflexure_microscope_server.things.stage.dummy import DummyStage
from openflexure_microscope_server.things.autofocus import AutofocusThing
from openflexure_microscope_server.things.camera_stage_mapping import CameraStageMapper
from openflexure_microscope_server.things import camera_stage_mapping
camera_stage_mapping.DEFAULT_SETTLING_TIME = 0 # skip the settling time for tests
@pytest.fixture
@ -117,5 +114,7 @@ def test_capture_array(client):
def test_camera_stage_mapping_calibration(client):
"""Check that camera stage mapping can run without an exception."""
camera = lt.ThingClient.from_url("/camera/", client)
camera.settling_time = 0
camera_stage_mapping = lt.ThingClient.from_url("/camera_stage_mapping/", client)
camera_stage_mapping.calibrate_xy()