From f72fa46d3f87639cdd39dc0a71897ce5e4ee0a81 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 16 Oct 2025 13:49:41 +0100 Subject: [PATCH 1/3] remove motor_in_set_mode() passthrough --- src/server_common/helpers.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/server_common/helpers.py b/src/server_common/helpers.py index 3762906..0ba1b2e 100644 --- a/src/server_common/helpers.py +++ b/src/server_common/helpers.py @@ -3,7 +3,6 @@ import sys from typing import Dict -from genie_python import genie as g from genie_python.mysql_abstraction_layer import SQLAbstraction from server_common.ioc_data_source import IocDataSource @@ -50,9 +49,6 @@ def get_macro_values() -> Dict[str, str]: return macros -motor_in_set_mode = g.adv.motor_in_set_mode - - def _get_env_var(name: str) -> str: try: return os.environ[name] From 0d1e012b060ff79c053dd185ebf3d12bc99be358 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 16 Oct 2025 13:51:50 +0100 Subject: [PATCH 2/3] remove awful unneeded __get_env_var function --- src/server_common/helpers.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/server_common/helpers.py b/src/server_common/helpers.py index 0ba1b2e..d31992f 100644 --- a/src/server_common/helpers.py +++ b/src/server_common/helpers.py @@ -48,19 +48,11 @@ def get_macro_values() -> Dict[str, str]: print("Defined macros: " + str(macros)) return macros - -def _get_env_var(name: str) -> str: - try: - return os.environ[name] - except: - return "" - - MACROS = { - "$(MYPVPREFIX)": _get_env_var("MYPVPREFIX"), - "$(EPICS_KIT_ROOT)": _get_env_var("EPICS_KIT_ROOT"), - "$(ICPCONFIGROOT)": _get_env_var("ICPCONFIGROOT"), - "$(ICPVARDIR)": _get_env_var("ICPVARDIR"), + "$(MYPVPREFIX)": os.environ.get("MYPVPREFIX", ""), + "$(EPICS_KIT_ROOT)": os.environ.get("EPICS_KIT_ROOT", ""), + "$(ICPCONFIGROOT)": os.environ.get("ICPCONFIGROOT", ""), + "$(ICPVARDIR)": os.environ.get("ICPVARDIR", ""), } CONTROL_SYSTEM_PREFIX = MACROS["$(MYPVPREFIX)"] + "CS:" PVPREFIX_MACRO = "$(MYPVPREFIX)" From 51688e52219e28cfc8c83fea0b24a96da33800c8 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 16 Oct 2025 13:55:36 +0100 Subject: [PATCH 3/3] ruff format --- src/server_common/helpers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server_common/helpers.py b/src/server_common/helpers.py index d31992f..9154ae5 100644 --- a/src/server_common/helpers.py +++ b/src/server_common/helpers.py @@ -48,6 +48,7 @@ def get_macro_values() -> Dict[str, str]: print("Defined macros: " + str(macros)) return macros + MACROS = { "$(MYPVPREFIX)": os.environ.get("MYPVPREFIX", ""), "$(EPICS_KIT_ROOT)": os.environ.get("EPICS_KIT_ROOT", ""),