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

Rhfogh develop #1029

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Rhfogh develop #1029

merged 3 commits into from
Sep 30, 2024

Conversation

rhfogh
Copy link
Collaborator

@rhfogh rhfogh commented Sep 23, 2024

Fixed bug in GPhL workflow recentring handling.

Also added provisional code for integration with ESRF workflow and LIMS. NB this code is specific to GPhL workflow and only executed when relevant code is present on the main MXCuBE side - so, in practice - a no-op.

@@ -2022,6 +2022,9 @@ def __init__(self):
self.acquisition_dose = 0.0
self.strategy_length = 0.0

# Workflow attributes - for passing to LIMS (conf Olof Svensson)
Copy link
Member

Choose a reason for hiding this comment

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

What does "(conf Olof Svensson)" mean ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is code that 1) is used on Massif-1 but not anywhere else or by thw main develop version; 2) is still provisional, since the ICAT LIMS and connections ro it (as I understand it) are still not stable or documented. I have coded this so that it will work (but do nothing) in the main develop branch, and put it there to make it easier to track what is going on and avoid having a completely different branch for MASSIF-1.

Anyway, that is what it means.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, I see

@marcus-oscarsson marcus-oscarsson merged commit 4547d28 into mxcube:develop Sep 30, 2024
9 checks passed
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.

2 participants