From 83fd27261dd41f470a9dc36dca07c8abe5fe8544 Mon Sep 17 00:00:00 2001 From: Gary Yendell Date: Tue, 28 Nov 2023 16:13:57 +0000 Subject: [PATCH] Only create controller once --- src/eiger_fastcs/__main__.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/eiger_fastcs/__main__.py b/src/eiger_fastcs/__main__.py index 5f6f8d9..7767f1a 100644 --- a/src/eiger_fastcs/__main__.py +++ b/src/eiger_fastcs/__main__.py @@ -13,30 +13,24 @@ def get_controller() -> EigerController: ip_settings = IPConnectionSettings("127.0.0.1", 8080) - tcont = EigerController(ip_settings) - return tcont + return EigerController(ip_settings) -# TODO: Maybe combine this with test_ioc -def create_gui() -> None: - tcont = get_controller() - m = Mapping(tcont) +def create_gui(controller) -> None: + m = Mapping(controller) backend = EpicsBackend(m) backend.create_gui() -def test_ioc() -> None: - tcont = get_controller() - m = Mapping(tcont) +def test_ioc(controller) -> None: + m = Mapping(controller) backend = EpicsBackend(m) ioc = backend.get_ioc() - ioc.run() -def test_asyncio_backend() -> None: - tcont = get_controller() - m = Mapping(tcont) +def test_asyncio_backend(controller) -> None: + m = Mapping(controller) backend = AsyncioBackend(m) backend.run_interactive_session() @@ -46,8 +40,9 @@ def main(args=None): parser.add_argument("-v", "--version", action="version", version=__version__) args = parser.parse_args(args) - create_gui() - test_ioc() + controller = get_controller() + create_gui(controller) + test_ioc(controller) # test with: python -m eiger_fastcs