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-1383, LIMS-160, LIMS-269: Improve reprocessing #812

Merged

Conversation

ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-1383
JIRA ticket: LIMS-160
JIRA ticket: LIMS-269

Summary:

Fix 3 tickets all related to reprocessing, fixing a bug and adding extra features. While we look at it, improve the GUI a bit.

Changes:

  • Rename method elements to pipeline
  • Add dropdown options for indexing method (uses xia2 keyword method hence renaming above)
  • Rename Options button as Xia2 Options, grey out the options if a non-xia2 pipeline is chosen
  • Add options for Xia2 keywords cc_half, isigma, misigma, sigma_strong and method
  • Add a blank option for space group, otherwise P1 is the default
  • Close Reprocessing dialog if the Multicrystal button is clicked
  • Do all the above for the Multicrystal reprocessing page
  • Make Xia2 Options be a button which opens the options on the Multicrystal reprocessing page

To test:

  • As Zocalo gets the reprocessing parameters from the live db, update config.php to have live db credentials
  • Copy these variables from the production config.php: $zocalo_mx_reprocess_queue, $zocalo_server, $zocalo_username and $zocalo_password
  • Xia2 can be pretty slow so you only need to select 1-200 images for each job
  • Keep the dev console open, then you can see the processingJobId returned from the database. Then you can run these queries when you have submitted a job to see if the parameters have been successfully added
select * from ProcessingJob where processingJobId = 123456789;
select * from ProcessingJobParameter where processingJobId = 123456789;
select * from AutoProcProgram where processingJobId = 123456789;
  • Go to proposal mx23694 and choose a dataset for which the autoprocessing ran successfully, but no reprocessing has been done (to make it easier to keep track)
  • Click the "cog" icon to open the Reprocessing dialog. Check the "Space Group / Cell" and "Xia2 Options" buttons open further options. Check the space group is blank by default
  • Change the pipeline to fast_dp and check the Xia2 options are greyed out. Click Integrate and check fast_dp runs
  • Change the pipeline to Xia2 DIALS, check the Xia2 options are enabled. Put some numbers in each, choose an indexing method (eg fft3d), select a subset of images to speed it up (eg 1-200). Match the space group to that of a previous Xia2 Dials run, and click Integrate, check it runs.
  • When it completes, view the Logs and Files and view the xia2.txt file. Check the command line that is printed within that, it should show the parameters you selected
  • Click the "plus" sign on the right of the reprocessing dialog, to add another processing job to the dialog. Select "Process individually", you should get a pipeline selection for each job, as well as a space group / cell button. The Xia2 options wont grey out now, as one of the jobs could be Xia2. Select 100 images in each job and Integrate. When the jobs complete, check any Xia2 options are shown in the command line as before
  • Click the Multicrystal button on the top right of the Reprocessing dialog. Check the Reprocessing dialog closes as you go to the new page
  • Check space group is now a drop down, with a blank first option
  • Check the Xia2 Options button opens more options, which are greyed out when fast_dp or autoPROC is selected
  • Drag across some images on one or more data collections, put in some options and press Integrate
  • When that has completed, you should see it somewhere on the top half of the page, check the arguments are what you submitted
  • Dont forget to roll back config.php to have dev db credentials

@ndg63276 ndg63276 changed the title Fix/lims 1383/reprocessing defaults to p1 LIMS-1383, LIMS-160, LIMS-269: Improve reprocessing Jul 25, 2024
@NKatti2011
Copy link
Collaborator

Should the 'small molecules' option be seperate from 'Xia2 Options' for other processing pipelines?

@NKatti2011
Copy link
Collaborator

Do we expect ProcessingJobParameter to not be populated when space group is not selected?

@ndg63276
Copy link
Collaborator Author

ndg63276 commented Aug 5, 2024

Should the 'small molecules' option be separate from 'Xia2 Options' for other processing pipelines?

No, "small molecules" is a Xia2 command line option (like the others), so it should be greyed out for other pipelines.

Do we expect ProcessingJobParameter to not be populated when space group is not selected?

Yes.

@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R4.1 August 16, 2024 12:44
@ndg63276 ndg63276 merged commit 3460cf9 into pre-release/2024-R4.1 Aug 16, 2024
2 checks passed
@ndg63276 ndg63276 deleted the fix/LIMS-1383/reprocessing-defaults-to-P1 branch August 27, 2024 09:25
ndg63276 added a commit that referenced this pull request Sep 3, 2024
* LIMS-1355: Make OAuth2 support more generic (#792)

* LIMS-1383, LIMS-160, LIMS-269: Improve reprocessing (#812)

* LIMS-1379: Grid scan heatmaps are not snaked correctly (#800)

* LIMS-1119: Show text on small buttons (#798)

* LIMS-700: Allow bulk editing of protein (#808)

* LIMS-1371, LIMS-1372: Add search and 'My Groups' to Sample Groups page (#579)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants