Repository navigation
Scan sync from FNAL: comparison/tolerance semantics, PV-reference evaluation, and while-command updates - #4033
Open
zongweiyuan wants to merge 4 commits into
Open
zongweiyuan wants to merge 4 commits into
zongweiyuan wants to merge 4 commits into
Conversation
added 4 commits
November 17, 2026 12:20
Port scan model/client/ui and scan-server changes from fermi-ad/phoebus-fnal. Includes PVReference and While command support, scan-server command/runtime updates, and resource/script updates. Removes scan-server test sources not present in the FNAL source module.
- Apply Sonar/style fixes across While/Loop command and impl classes - Clean unused imports, naming, commented code, and logging formatting - Refactor methods flagged for complexity and modernize instanceof patterns - Update PVReferenceTest method visibility for JUnit 5 style - Keep behavior intact; build/test already passed with JDK 25
- Apply final naming/instanceof/style cleanups in model and server command classes - Clean Derby/RDB logger formatting and variable naming issues - Keep behavior unchanged and preserve runtime logic - Verified compile and clean test success with JDK 25 for target modules
- Fix final naming/style warnings in WhileCommand and WhileCommandImpl - Guard DerbyDataLogger startup log evaluation by log level - Rename local variable in RDBDataLogger to avoid field shadowing - Preserve behavior; build/test verified by user with JDK 25
|
This branch has not been deployed
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
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.


Description
This PR syncs scan model/server changes from the FNAL branch into upstream scan modules, with focus on condition evaluation behavior and runtime consistency.
Why
What Changed
Comparison and Tolerance Behavior (explicit)
Runtime Semantics Improvements
Validation
PR Checklist
Scope and Intent
Functional Behavior
IfCommandsupports configured comparison mode at runtime.WaitCommandsupports configured comparison mode at runtime.WhileCommanduses configured comparison mode correctly during loop condition checks.IN/NOT_INbehavior works as list-membership checks.Tolerance Semantics
EQUALSuses tolerance deadband (within $ \pm tolerance $).UNEQUALis the inverse of tolerance deadband.AT_LEAST/AT_MOSTinclude tolerance-adjusted boundary logic.ABOVE/BELOWrequire crossing beyond tolerance boundary.IN/NOT_IN.Model, Serialization, and UX
toString()output reflects comparison/tolerance accurately.Loop/While Runtime Consistency
Tests
app/scan/modelandservices/scan-server.IN/NOT_INstring-list behavior.Build and Environment
mvn -pl app/scan/model,services/scan-server -am clean test -DskipITsNotes