Commit graph

206 commits

Author SHA1 Message Date
Julian Stirling
13d3871059 Add testing for loading the tuning files in the normal test suite now not tied to picamera 2025-11-11 11:20:08 +00:00
Julian Stirling
ec16cc17f8 Update tuning file utils for our own tuning files. 2025-11-11 11:20:07 +00:00
Julian Stirling
cd5d74b5e6 Add tests for not reading ongoing scan data 2025-11-04 18:50:17 +00:00
Julian Stirling
e4cb48eb6d Stricter rules on pytest.raises, requiring match for generic error types
Closes #560
2025-10-28 17:20:40 +00:00
Julian Stirling
adf9736fab Add testing for patching json files 2025-10-27 15:07:45 +00:00
Julian Stirling
9e9764e196 Implement JSON Merge Patch from IETF RFC 7396 2025-10-27 15:07:43 +00:00
Julian Stirling
418a6b5364 Merge branch 'calibration-wizard-refactor' into 'v3'
Refactor Calibration Wizard

Closes #578

See merge request openflexure/openflexure-microscope-server!415
2025-10-27 14:15:05 +00:00
Julian Stirling
94c9a0e7dd Merge branch 'rom_test_only' into 'v3'
Adding automatic range of motion measurements

See merge request openflexure/openflexure-microscope-server!335
2025-10-27 12:18:31 +00:00
Julian Stirling
df979eb3cf Add checks for new calibration required property to tests 2025-10-26 15:47:41 +00:00
Julian Stirling
08046ff657 Clarify behaviour of overloads, and better error checking of _move_and_measure inputs 2025-10-24 17:27:43 +01:00
Julian Stirling
ba8a4ca744 Apply suggestions from code review of branch rom_test_only
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-10-24 14:05:07 +00:00
Julian Stirling
b8eb1907c3 Modify range of motion _move_back_until_motion_detected to move in SMALL_STEP steps
This will carry on until at least 1.5x BIG_STEP in total motion. If
no motion is detected then something is up.
2025-10-21 14:40:18 +01:00
Julian Stirling
7f657ae853 No error on parasitic motion after small step checking for stage movement, use background detect 2025-10-20 23:02:08 +01:00
Julian Stirling
72c35c302c Adjust CSM Thing to allow calculation of stage coords from img coords and use this in stage measure
Using this stops the z-axis being flipped when the off diagonal elements of the CSM are different
signs.
2025-10-20 22:20:19 +01: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
635375a012 Fix assumption that CSM was a numpy array not a list 2025-10-20 16:40:41 +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
b314ced4f7 Final Range of motion tests 2025-10-17 17:31:34 +01:00
Julian Stirling
30217a4c38 Add tests for initial moves at start of ROM test 2025-10-17 15:19:06 +01:00
Julian Stirling
95f5bbb16c Ensure ROM z-predict returns an integer and add more tests. 2025-10-17 15:19:06 +01:00
Julian Stirling
3d49cbf921 Adding even more ROM tests 2025-10-17 15:19:06 +01:00
Julian Stirling
664c7de5f8 Add more ROM tests 2025-10-17 15:19:06 +01:00
Julian Stirling
50d6298c06 Start updating ROM tests for new structure 2025-10-17 15:19:06 +01:00
Chish36
1e7ad7bf29 Fixed ruff errors 2025-10-17 15:19:06 +01:00
Ben Chisholm
e5b0c7f049 Created function to collate data with unit test for it 2025-10-17 15:19:06 +01:00
Chish36
094cb94da8 Ruff formatting 2025-10-17 15:19:06 +01:00
Chish36
773f19ee36 Added unit test for parasitic error 2025-10-17 15:19:06 +01:00
Chish36
1e7f62f8ad 2 unit tests added. Added a dummy matrix to mock_csm and changed position in mock_stage to a dictionary. 2025-10-17 15:19:06 +01:00
Julian Stirling
96ffbb2b49 Bump version for alpha3 and update changelog 2025-10-09 19:55:42 +01:00
jaknapper
b58ddbf7d9 Update testing 2025-10-09 17:51:15 +01:00
Julian Stirling
94541b2d4f Merge branch 'stack-height-sanitise' into 'v3'
Verify stack params at start of scan main loop

Closes #455

See merge request openflexure/openflexure-microscope-server!400
2025-10-09 14:00:59 +00:00
Joe Knapper
089beae01a Tests for coercing stack params to valid values.
Co-authored with Julian Stirling
2025-10-09 14:26:01 +01:00
Joe Knapper
dae5b816cc Merge branch 'sample-size-sim' into 'v3'
Simulate a rectangular sample

Closes #516

See merge request openflexure/openflexure-microscope-server!401
2025-10-07 10:09:37 +00:00
Joe Knapper
2fc92fc1ff Test sample and canvas size 2025-10-02 13:56:08 +01:00
Joe Knapper
bfe0064ce8 Update dummy test and fix sample coords 2025-09-25 16:14:13 +01:00
Julian Stirling
91c4fb22db Remove checks that purge empty scans is run in run_scan as it has moved 2025-09-25 15:16:23 +01:00
Joe Knapper
0e5517d45c Fix another hardcoded linux test 2025-09-25 12:04:39 +01:00
Julian Stirling
b9ca8b3094 Apply suggestions from code review of branch Increased-linting
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-09-19 10:16:47 +00:00
Julian Stirling
6b1e40f689 Add flake8-simplicity rules 2025-09-18 16:21:45 +01:00
Julian Stirling
d7d1f42b2c Enable PyTest ruff checks 2025-09-18 16:21:45 +01:00
Julian Stirling
9c20c18230 Remove mock for loading tuning file during test as it no longer needs to talk to hardware. 2025-09-18 13:00:46 +01:00
Julian Stirling
24233412af Start adding ANN ruff rules 2025-08-27 18:54:15 +01:00
Julian Stirling
2325dced5e Merge branch 'test-server-startup' into 'v3'
Test server startup

See merge request openflexure/openflexure-microscope-server!379
2025-08-27 16:11:34 +00:00
Julian Stirling
4af4e89c0a Merge branch 'no-uvicorn.error-logs-without-error' into 'v3'
Stop reporting uvicorn.error in log file unless log it is an error

Closes #511

See merge request openflexure/openflexure-microscope-server!375
2025-08-27 14:30:11 +00:00
Julian Stirling
5515d55e6d Merge branch 'error-types' into 'v3'
Tweak a few error types.

Closes #320

See merge request openflexure/openflexure-microscope-server!376
2025-08-27 13:47:26 +00:00
Julian Stirling
353d311c1e Apply suggestions from code review of branch no-uvicorn.error-logs-without-error
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2025-08-27 13:24:37 +00:00
Julian Stirling
2d89cdd3a3 Add tests for the legacy api 2025-08-24 20:45:55 +01:00
Julian Stirling
e53f4e3b2b Remove the conftest defined fixtures as mock methods return mocks already removing the need for the defined mocks 2025-08-24 19:22:19 +01:00
Julian Stirling
867cd0cad1 Add further server setup tests splitting up configuration testing from CLI 2025-08-24 19:11:03 +01:00