Ticket8614 mercury ips magnet supply #9
Merged
Conversation
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
…lator tree into this support module, as the modern and preferred method
…lanning on splitting the device and states was not a good idea, so have reworked the existing files to cater for both variants
…he response, which should have been %*f reads, but were %f, which messed up the record.
… ProcServLauncher in IOC parameters to significantly speed up IOC instantiation. Left as comment in case needed again at a later date.
…larmsTemperatureBoard, readSysAlarmsLevelMeterBoard, the latter are "I/O Intr" type records"
…net temperature board status.
…eter board status in modes.py
…ding rate SLOW or FAST.
…tes setting and reading.
… tests as these PVs are no longer needed and removed
This was referenced Sep 9, 2025
Member
Tom-Willemsen
left a comment
Tom-Willemsen
left a comment
There was a problem hiding this comment.
- Should: have you run the python files through
ruff format?
c:\Instrument\Apps\EPICS\support\IPS\master>r format --check
Would reformat: system_tests\lewis_emulators\ips\device.py
Would reformat: system_tests\lewis_emulators\ips\interfaces\stream_interface.py
Would reformat: system_tests\lewis_emulators\ips\interfaces\stream_interface_scpi.py
Would reformat: system_tests\lewis_emulators\ips\modes.py
Would reformat: system_tests\lewis_emulators\ips\states.py
Would reformat: system_tests\tests\ips.py
Would reformat: system_tests\tests\ips_common.py
Would reformat: system_tests\tests\ips_scpi.py
8 files would be reformatted, 5 files already formatted
system_tests/lewis_emulators/ips/interfaces/stream_interface_scpi.py
Outdated
Show resolved
Hide resolved
system_tests/lewis_emulators/ips/interfaces/stream_interface_scpi.py
Outdated
Show resolved
Hide resolved
system_tests/lewis_emulators/ips/interfaces/stream_interface_scpi.py
Outdated
Show resolved
Hide resolved
Contributor
Author
Yes - Ruff and Pyright both were passing. |
…ing legacy timeout issues.
… loading efficiency at test time (as with the SCPI IOC)
Tom-Willemsen
force-pushed
the
Ticket8614_mercury_IPS_magnet_supply
branch
from
fdc1b39 to
3590a5e
Compare
Tom-Willemsen
approved these changes
Oct 16, 2025
Contributor
Author
There was a problem hiding this comment.
Agreed - no point leaving misleading stuff in there that isn't used.
Contributor
Author
There was a problem hiding this comment.
Good to have moved common tests to a module.
system_tests/tests/ips.py
Outdated
| "directory": get_default_ioc_dir("IPS"), | ||
| "emulator": EMULATOR_NAME, | ||
| "lewis_protocol": "ips_legacy", | ||
| # "ioc_launcher_class": ProcServLauncher, |
Contributor
Author
There was a problem hiding this comment.
I seem to have a bad habit of leaving commented out code cluttering the place.
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.
Added support for the new Mercury IPS SCPI protocol and additional features.