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

Merge branch 'sharpness-monitor-none' into 'v3'

Browse source 
Sharpness monitor accepting 0 as None

Closes #776

See merge request openflexure/openflexure-microscope-server!592
This commit is contained in:
Joe Knapper 2026-05-15 15:27:52 +00:00
commit bea1e35d61
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -274,7 +274,7 @@ class JPEGSharpnessMonitor:
dependency as required by the underlying class.
:param method: The sharpness metric used when evaluating autofocus.
:param record: Bitmask of sharpness metrics to record while monitoring.
If ``None``, only the metric specified by ``method`` is recorded.
If ``None`` or 0, only the metric specified by ``method`` is recorded.
:raises ValueError: If ``method`` is not included in ``record``.
:raises ValueError: If ``SharpnessMethod.FOCUS_FOM`` is requested but
@ -283,7 +283,7 @@ class JPEGSharpnessMonitor:
self.camera = camera
self.stage = stage
self.method = method
self.record = method if record is None else record
self.record = record if record else method
if not self.method & self.record:
raise ValueError(