Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make get beamline name return unchanged beamline #66

Merged
merged 2 commits into from
May 22, 2023
Merged

make get beamline name return unchanged beamline #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c63750
mkae get beamline name return unchanged beamline
dperl-dls May 22, 2023
756cd3d
i03 defaults to simulator if no BEAMLINE present
DominicOram May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dodal/i03.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
8 changes: 2 additions & 6 deletions src/dodal/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down