Register screening as autoproc program #325
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Removes the initial creation of the screening record from the wrapper. This will be performed in a separate recipe step along with the creation of an AutoProcProgram record, which will be linked to the screening record. The AutoProcProgram record will be updated to reflect the processing status of the pipeline. Two conditional ispyb commands have been added to the wrapper to update the processing status accordingly when the pipeline completes showing success if a solution is found and failure if no valid solution exists. If any of the steps in the pipeline fail with a non-zero return code, the processing status will be set to 'Failed' via a separate recipe step.
Also removes beamline check from within the wrapper as this will cause the wrapper to succeed but when it hasn't really run. In the workflow a screening record will have already been created. If beamline restriction is still desired, this should be done in the trigger step and not in the wrapper.
Also removes depracated strategy pipelines
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses mx-analysis#22.
Merge only when
SynchWeb changes to handle these changes are also ready to be deployed
Recipes are also ready to be updated to accommodate these changes
Moves the step registering a record in the Screening table of ISPyB outside of the wrapper. Instead, this step will be completed alongside the creation of an AutoProcProgram record before the wrapper is run. Updates are then made to the AutoProcProgram record via calls to the ISPyB service.
Uses ispyb-api version 11.1.0, which contains the update to the mx-screening method that allows population of the autoProcProgramId in the Screening table.
Previous behaviour of screening results was to have a separate screening record per result. This behaviour has changed, there will now be a single Screening record per pipeline run and separate ScreeningOutput, ScreeningStrategy and ScreeningStrategyWedge records per result.
Recipe changes will need to be deployed alongside this PR for the changes to work properly. This PR should also only be merged when SynchWeb has been updated to handle the new behaviour as this will likely break the existing SynchWeb changes. Overall progress on this issue can be tracked in https://jira.diamond.ac.uk/browse/LIMS-1917