Continuous scan#29
Merged
Merged
Conversation
Do not stop and restart the scanning for each frame. This version is probably broken due to data races; we need to add mutexes around the data accessed from acquisition threads. (Assisted by Claude Code; any errors are mine.)
Prevent data races. (Assisted by Claude Code; any errors are mine.)
(Assisted by Claude Code; any errors are mine.)
That is, fail if the next buffer is not ready when we need to write. (Assisted by Claude Code; any errors are mine.)
(Assisted by Claude Code; any errors are mine.)
This needed in case previous acquisition was same configuration but stopped mid-frame. (Assisted by Claude Code; any errors are mine.)
- Use fewer variables to describe current state, explicitly - Buffer overflow is always an error (Assisted by Claude Code; any errors are mine.)
In the Micro-Manager case, this corresponds to stopping if InsertImage() returns an error.
(Assisted by Claude Code; any errors are mine.)
- missing 'return' - Avoid 'Wrap' of NULL error (Analysis/discovery assisted by Claude Code.)
(Assisted by Claude Code; any errors are mine.)
(Assisted by Claude Code; any errors are mine.)
(Assisted by Claude Code; any errors are mine.)
(Assisted by Claude Code; any errors are mine.)
We cannot use FiniteSamps with sample count > INT32_MAX (DAQmx limit), so don't allow more frames than fit under that limit. As an exception, use ContSamps for Live mode (frame count >= INT32_MAX, due to how openscan-mm-adapter currently handles it). (Assisted by Claude Code; any errors are mine.)
Member
Author
|
Tested with internal and external detector, looks okay. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #15.
Continuously scan multiple frames with no extra gap in between.
Also fix thread synchronization, which was missing.
There are still pauses between unpark/park and the raster scans.