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

LIMS-697: Use more specific PVs for puck names #712

Merged
merged 4 commits into from
Feb 5, 2024

Conversation

ndg63276
Copy link
Collaborator

Github issue: #53
JIRA ticket: LIMS-697

Summary:

@jlmuir points out that not all facilities have a one-to-one mapping of beamlines to pv prefixes (DLS included). As the $bl_pv_map variable is only used in one place, we should replace it with a template for the specific PVs it is used for.

Changes:

  • Remove $bl_pv_map variable
  • Remove DLS-specific hardcoded PV names
  • Add $bl_puck_names variable for a template for the puck names PV

To test:

  • Go to the assign container page for a visit (eg /assign/visit/cm37235-1) and check the loaded pucks are displayed next to the puck number (eg CPS-0001 below)
    image

Copy link
Collaborator

@gfrn gfrn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the way PV searches are done (build PV name array, then mass caget, and reindex, searching for the returned PVs in the initial array) feels a bit off, but I cannot say with absolute certainty it can be refactored without affecting other bits of code elsewhere.

Also, long shot, but EPICS exposes EPICS_BASE and EPICS_HOST_ARCH, so if we really wanted to, we could also build the path from these environment variables rather than from a path to caget in config.php, but that's minimal

@ndg63276 ndg63276 merged commit 1502600 into prerelease Feb 5, 2024
2 checks passed
@ndg63276 ndg63276 linked an issue Feb 5, 2024 that may be closed by this pull request
@ndg63276 ndg63276 deleted the improvement/LIMS-697/use-more-specific-pvs branch February 5, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Assumes one-to-one mapping of beamline to PV prefix
2 participants