Merge pull request #66 from DiamondLightSource/artemis_661_fix_get_be…

…amline_name make get beamline name return unchanged beamline
DiamondLightSource · May 22, 2023 · dcac18a · dcac18a
2 parents 491bb53 + 756cd3d
commit dcac18a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/dodal/i03.py b/src/dodal/i03.py
@@ -19,7 +19,7 @@
 from dodal.log import set_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, skip_device
 
-BL = get_beamline_name("i03")
+BL = get_beamline_name("s03")
 set_beamline(BL)
 
 

diff --git a/src/dodal/utils.py b/src/dodal/utils.py
@@ -61,12 +61,8 @@
 T = TypeVar("T")
 
 
-def get_beamline_name(ixx: str) -> str:
-    bl = environ.get("BEAMLINE")
-    if bl is None:
-        return f"s{ixx[1:]}"
-    else:
-        return bl
+def get_beamline_name(default: str) -> str:
+    return environ.get("BEAMLINE") or default
 
 
 def get_hostname() -> str: