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

707 add visr b01 1 as a beamline with devices #708

Merged
merged 16 commits into from
Oct 1, 2024

Conversation

stan-dot
Copy link
Contributor

Fixes #707

Instructions to reviewer on how to test:

  1. make sure dodal connect b-01-1 is successful
  2. panda and manta should connect (skipping the stage for now)

Checks for reviewer

  • Would the PR title make sense to a scientist on a set of release notes
  • If a new device has been added does it follow the standards
  • If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
  • Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

@stan-dot stan-dot linked an issue Jul 26, 2024 that may be closed by this pull request
Copy link

codecov bot commented Jul 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.02%. Comparing base (44803d5) to head (f0d3dfc).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #708      +/-   ##
==========================================
+ Coverage   95.00%   95.02%   +0.01%     
==========================================
  Files         116      117       +1     
  Lines        4744     4762      +18     
==========================================
+ Hits         4507     4525      +18     
  Misses        237      237              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@stan-dot stan-dot self-assigned this Jul 26, 2024
@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from 64e281b to 9ec6d16 Compare August 16, 2024 10:02
@stan-dot
Copy link
Contributor Author

this is still not connecting :(

@stan-dot stan-dot marked this pull request as ready for review August 16, 2024 15:38
@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch 3 times, most recently from 6df8028 to 6b6c6fd Compare August 23, 2024 07:15
src/dodal/beamlines/b01-1.py Outdated Show resolved Hide resolved
src/dodal/beamlines/b01-1.py Outdated Show resolved Hide resolved
src/dodal/beamlines/b01-1.py Outdated Show resolved Hide resolved
# set_directory_provider(PandASubdirectoryProvider())


def panda(
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a panda on this beamline? I don't see it on the beamline synoptic screen, nor is there a soft-ioc for it in kubernetes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, there is. there is aan argocd migration going on at the moment.

@marcelldls mentioned it shouldn't take too long

src/dodal/beamlines/b01-1.py Outdated Show resolved Hide resolved
src/dodal/beamlines/b01-1.py Outdated Show resolved Hide resolved
src/dodal/beamlines/b01-1.py Outdated Show resolved Hide resolved
@DiamondJoseph
Copy link
Contributor

Realised I was looking at BL01B: is VISR 01B or 01C? There's no synoptic screen for the latter.

@stan-dot
Copy link
Contributor Author

@DiamondJoseph , ViSR is the C variant and it does not have an epics screen

@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from 5456f80 to 5adfca4 Compare August 28, 2024 08:58
@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch 2 times, most recently from c73d3e7 to 27a7af2 Compare September 13, 2024 08:27
@stan-dot
Copy link
Contributor Author

panda is supposed to be off at the moment

@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from c4d47b2 to 17592bc Compare September 13, 2024 13:28
@stan-dot
Copy link
Contributor Author

trying to fix manta connect errors, pending comment from @marcelldls

@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch 3 times, most recently from 0b89ab2 to 024aad9 Compare September 18, 2024 14:46
@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from 362c3b7 to 4a0ec5a Compare September 25, 2024 07:44
@stan-dot
Copy link
Contributor Author

connects ok

@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from 4a0ec5a to bf93291 Compare September 27, 2024 11:54
@stan-dot
Copy link
Contributor Author

@DominicOram is the use of the force override for the non-standard beamline name ok here?

@DominicOram
Copy link
Contributor

DominicOram commented Sep 27, 2024

@DominicOram is the use of the force override for the non-standard beamline name ok here?

Really get_beamline_name is just an abstraction around getting the BEAMLINE env variable. So why do you need to force it? Is there no BEAMLINE env defined for VISR? Or you want to be able to connect to VISR from other beamlines?

Either way, it's probably better to just do BL = "c01" rather than pass a parameter that basically makes the function a null-op

@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from bf93291 to c853eab Compare September 30, 2024 10:25
@stan-dot
Copy link
Contributor Author

@DominicOram this is quite ready now

@stan-dot stan-dot force-pushed the 707-add-visr-b01-1-as-a-beamline-with-devices branch from 8fff19d to 2f74213 Compare October 1, 2024 08:54
Copy link
Contributor

@DominicOram DominicOram left a comment

Choose a reason for hiding this comment

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

Great, one question otherwise good.

src/dodal/beamlines/b01_1.py Show resolved Hide resolved
@stan-dot stan-dot merged commit f2e63c2 into main Oct 1, 2024
18 checks passed
@stan-dot stan-dot deleted the 707-add-visr-b01-1-as-a-beamline-with-devices branch October 1, 2024 10:01
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.

Add ViSR (b01-1) as a beamline with devices
4 participants