Commit graph

45 commits

Author SHA1 Message Date
Joe Knapper
b4957e0420 SnakeScan as a scan planner 2026-02-09 13:09:07 +00:00
Julian Stirling
7bc4c514a6 Autofix import order 2025-12-02 16:26:15 +00:00
Julian Stirling
dfe7fb6c42 Stop scan planner plots erroring if there are no secondary locations 2025-11-28 12:00:35 +00:00
Julian Stirling
90be139575 Update scan planners so secondary locations are imaged first and don't affect later planning 2025-11-28 09:53:24 +00:00
Julian Stirling
ff606ff10d Apply spelling corrections and variable renaming from code review of branch improve-scan-planning
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-10-20 18:26:20 +01:00
Julian Stirling
dbb0a4ac16 Fix issues found by MyPy 2025-10-19 23:04:24 +01:00
Julian Stirling
f781e6b674 Image intermediate locations between sample and background 2025-10-19 21:29:11 +01:00
Julian Stirling
39a04df5be Objects for scan locations allowing more sophisitcated tracking.
This commit updates the scan planners to allow more sophisticated
tracking of past positions. Currently it still checks that
the algorithm is unchanged from past behaviour.
2025-10-19 19:55:36 +01:00
Julian Stirling
6b1e40f689 Add flake8-simplicity rules 2025-09-18 16:21:45 +01:00
Joe Knapper
9973221ed9
Merge branch 'neighbour-ratio' into 'v3'
Change neighbour ratio to dx and dy

See merge request openflexure/openflexure-microscope-server!371
2025-09-05 10:56:29 +00:00
jaknapper
980b1e5187 Type hints to inits in scan planners 2025-09-05 11:22:43 +01:00
jaknapper
ce5a22eb64 Added neighbour ratio to spiral scan init 2025-09-05 10:55:21 +01:00
Julian Stirling
2ce49088e7 Add return typehints to magic methods 2025-08-27 18:56:09 +01:00
Julian Stirling
4c46330959 Add ANN20X rules to ruff 2025-08-27 18:56:08 +01:00
Julian Stirling
24233412af Start adding ANN ruff rules 2025-08-27 18:54:15 +01:00
Julian Stirling
dade26cde1 Tweak a few error types. 2025-08-21 16:11:30 +01:00
jaknapper
85e10189be Restore behaviour that uses nearest focused pos if adjacent fails 2025-08-19 14:54:38 +01:00
jaknapper
501fe3f9d2 Switch to neighbour cutoff based on dx and dy 2025-08-19 14:07:30 +01:00
jaknapper
422e63ea90 Increase neighbour ratio to 1.6 2025-08-15 18:56:26 +01:00
Julian Stirling
7e6017f648 Get codespell passing and add it as a CI job. 2025-07-11 00:16:25 +01:00
Julian Stirling
80beeea07b Add punctuation to docstrings 2025-07-10 09:24:50 +01:00
Julian Stirling
4dc41bb008 Single line summaries of docstrings 2025-07-10 09:24:49 +01:00
Julian Stirling
35d47fe3ed Starting docstring on the same lines as the quotations 2025-07-10 09:24:49 +01:00
Julian Stirling
be6a6ca6fe No starting docstrings with This 2025-07-10 09:24:49 +01:00
Julian Stirling
f51dae7b3a Doc strings to imperative mood 2025-07-10 09:24:49 +01:00
Julian Stirling
a84a916719 Restructured text fixes so that pydoctor would return without an error 2025-07-09 23:59:08 +01:00
Julian Stirling
fc6c13f40e Apply suggestions from code review of branch fast-stack
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-06-27 10:41:53 +00:00
Julian Stirling
e90ff73499 Move smart stack specific scan planning logic to SmartSpiral 2025-06-27 01:08:55 +01:00
Julian Stirling
2aea6a2569 Docstrings and stop using Pydantic for ScanParameters 2025-06-26 19:46:25 +01:00
jaknapper
8ba40832e0 Neighbour cutoff moved from autofocus.py to scan_planners.py 2025-06-23 14:13:08 +01:00
jaknapper
333ea1b644 More input validation and comments 2025-06-23 12:02:00 +01:00
jaknapper
a001da0bcb Restore closest_focus_site function 2025-06-20 15:01:09 +01:00
jaknapper
00321d761d Update docstring for nearby focus site 2025-06-19 14:57:27 +01:00
jaknapper
c0677858a1 Scan planner finds lowest neighbour, not most recent 2025-06-18 15:40:21 +01:00
Joe Knapper
07cbef0536 Reimplement tie breaking by distance between 2025-04-17 10:25:40 +01:00
jaknapper
c895383a83 Remove repeated moves_from_centre() code 2025-04-17 10:12:12 +01:00
Joe Knapper
1248c2b7c8 Remove unneeded third sort key 2025-04-17 08:47:24 +00:00
Joe Knapper
b414697cfb Update testing for multiple sample shapes 2025-04-15 16:35:52 +01:00
jaknapper
7373424fcf Ruff formatting 2025-04-15 10:40:45 +01:00
jaknapper
ec25ae7126 Add a scan path planner that prioritises shorter moves 2025-04-14 18:49:35 +01:00
Julian Stirling
06632f195e Spelling corrections and docstring improvements
Co-authored by Joe Knapper <jaknapper@hotmail.com>
2025-04-14 15:46:27 +00:00
Julian Stirling
a0b6dbdfce Add weay to access a copy of the data from a ScanPlanner 2025-04-14 11:27:25 +01:00
Julian Stirling
91073535a8 More tests for scan planners 2025-04-14 11:27:25 +01:00
Julian Stirling
842e196f9b Add some basic tests, and do minor fixes based on tests and MyPy 2025-04-14 11:27:25 +01:00
Julian Stirling
1f66e8bc7a Enormous refactor of the scan code, was hard to find an intermediate working place to commit 2025-04-14 11:27:25 +01:00