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.

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

Remove i04-1 as it's unused and broken #872

Merged
merged 3 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 docs/how-to/create-beamline.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Each beamline should have its own file in the ``doodal.beamlines`` folder, in wh
beamline are instantiated. The file should be named after the colloquial name for the beamline. For example:

* ``i03.py``
* ``i04_1.py``
* ``i20_1.py``
* ``vmxi.py``

Beamline modules (in ``dodal.beamlines``) are code-as-configuration. They define the set of devices and common device
Expand Down
5 changes: 2 additions & 3 deletions src/dodal/beamlines/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@

# Where beamline names (per the ${BEAMLINE} environment variable don't always
# match up, we have to map between them bidirectionally). The most common use case is
# beamlines with a "-"" in the name such as "i04-1", which is not valid in a Python
# beamlines with a "-"" in the name such as "i20-1", which is not valid in a Python
# module name. Add any new beamlines whose name differs from their module name to this
# dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
_BEAMLINE_NAME_OVERRIDES = {
"i04-1": "i04_1",
"i13-1": "i13_1",
"i20-1": "i20_1",
"s03": "i03",
Expand Down Expand Up @@ -79,7 +78,7 @@ def _module_name_overrides() -> Mapping[str, set[str]]:
def module_name_for_beamline(beamline: str) -> str:
"""
Get the module name for a particular beamline, it may differ from the beamline
name e.g. i04-1 -> i04_1
name e.g. i20-1 -> i20_1
Args:
beamline: The beamline name as per the ${BEAMLINE} environment variable
Expand Down
140 changes: 0 additions & 140 deletions src/dodal/beamlines/i04_1.py

This file was deleted.

4 changes: 2 additions & 2 deletions tests/beamlines/unit_tests/test_mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"i03": "i03",
"s03": "i03",
"i04-1": "i04_1",
"i20-1": "i20_1",
"i22": "i22",
}.items(),
)
Expand All @@ -26,7 +26,7 @@ def test_all_beamline_names_includes_non_overridden_modules():

def test_all_beamline_names_includes_overriden_modules():
beamlines = set(all_beamline_names())
assert "i04-1" in beamlines
assert "i20-1" in beamlines


def test_all_beamline_names_includes_overriden_default_modules():
Expand Down
Loading