Merge dev/dc2025 (resolves #23 conflicts)#24
Merged
Conversation
…from starting scan timer NGX socket reads were racing between MultiCollector and ScanManager Timer threads, garbling TCP bytes and triggering duplicate StartAcq (E43) once integration_time changed mid-run. - Wrap NGX read_intensities in microcontroller.lock so trigger_acq + readline cycles serialize across threads. The lock was already initialized in NGXController but every call site was commented out. ask() uses a separate communicator lock so valve/source commands are unaffected. - Default _streaming_active to False so the plugin-instantiated singleton ScanManager does not start a scan timer until activate() runs (window opens). - Gate _integration_time_changed on _streaming_active to skip the redundant StopAcq/SetAcqPeriod and the auto reset_scan_timer fired by the DelegatesTo notification when AutomatedRun changes spectrometer.integration_time. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Resolve ngx.py conflict: keep main's refactored helper-based read_intensities body (deadline tracking, stale-event handling, _parse_acquisition_event, _filter_signals_for_event) and wrap it with dev/dc2025's microcontroller.lock serialization to prevent concurrent ScanManager + MultiCollector races. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
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.
Summary
Conflict resolution
pychron/spectrometer/isotopx/spectrometer/ngx.py— kept main's refactored helper-basedread_intensitiesbody (deadline tracking, stale-event handling,_parse_acquisition_event,_filter_signals_for_event) and wrapped it with dev/dc2025'smicrocontroller.lockserialization to prevent concurrent ScanManager + MultiCollector races.Public
read_intensities= lock gate. Private_read_intensities(timeout, trigger, verbose)= refactored body, threadstimeoutthrough to_get_intensity_deadline.Test plan
read_intensitiesstill returnskeys, signals, collection_time, inc🤖 Generated with Claude Code