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

DOD code merge to run 21. #46

Merged
merged 6 commits into from
Feb 5, 2024
Merged

DOD code merge to run 21. #46

merged 6 commits into from
Feb 5, 2024

Conversation

lg345
Copy link
Collaborator

@lg345 lg345 commented Jan 31, 2024

No description provided.

@lg345 lg345 linked an issue Jan 31, 2024 that may be closed by this pull request
Copy link
Collaborator

@gadorlhiac gadorlhiac left a comment

Choose a reason for hiding this comment

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

Looks fine to me - @lg345 can you decide on the naming for the lxe object? Otherwise a couple quick changes and it can be merged.

mfx/beamline.py Outdated
f"/reg/neh/operator/mfxopr/experiments/{get_current_experiment('mfx')}/wpcalib"
)
try:
lxe_pw = LXE("MFX:LAS:MMN:08", calibration_file=lxe_calib_file, name="lxe_pw")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are people happy with this nomenclature? When I added it in I didn't want to conflict with any objects others may have been trying to create at the time. If you'd prefer lxe to lxe_pw we should probably make that change before merging. It's probably useful to keep things consistent with muscle memory people have from moving between hutches?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

lxe will be the final name for the object.

mfx/beamline.py~ Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

This file should be untracked and removed. It's a backup emacs file which is not needed in the repo.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Looks fine to me. This was tested and found to still work during mfxx1006522 right?

@gadorlhiac gadorlhiac merged commit ae4fe23 into run21 Feb 5, 2024
1 check passed
@gadorlhiac gadorlhiac deleted the 45-dod-code branch February 5, 2024 17:27
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.

DOD Code
4 participants