Skip to content

LIMS-2126: Add new strategy pipeline and tidy code#1054

Merged
ndg63276 merged 1 commit into
pre-release/2026-R2.3from
improvement/LIMS-2126/new-strategy-pipeline
Apr 21, 2026
Merged

LIMS-2126: Add new strategy pipeline and tidy code#1054
ndg63276 merged 1 commit into
pre-release/2026-R2.3from
improvement/LIMS-2126/new-strategy-pipeline

Conversation

@ndg63276
Copy link
Copy Markdown
Collaborator

JIRA ticket: LIMS-2126

Summary:

Phil is adding a new strategy pipeline ("UDC Strategy"), we should display the results appropriately. Also the strategy fetching code can be optimised as lots is not used.

Changes:

  • Fix the getting of the pipeline description, as in MariaDB if("string") returns false
  • Order screening results by the order they are put into the db
  • Use consistent notation to control the number format of the fields
  • Remove various fields that were set but never used, and the functions used to set them
  • On the front end, only display the unit cell if some of it is set
  • Only show chi/phi/kappa/ranking res columns if the are set

To test:

  • Set in the config
$strat_align = array('XOalign', 'dials.align_crystal', 'xia2-dials+dials.align_crystal', 'UDC strategy');
  • Go to /dc/visit/mx23694-154/id/21392025, check a UDC strategy appears in the strategies bar, and the omega and chi angles are shown. (The relative transmission is set wrong in the db so the absolute transmission is displayed as 0)
  • Check the alignment strategies show the chi and phi angles and the unit cell (but no omega or transmission etc)
  • Go to a data collection with mosflm strategy results (eg /dc/visit/cm44138-1/id/21135234), check Mosflm shows both the unit cell and the data collection parameters
  • Find an old data collection with EDNA strategy results (eg /dc/visit/cm19645-4/id/2983769), check EDNA shows both the unit cell and the data collection parameters)

@gfrn
Copy link
Copy Markdown
Collaborator

gfrn commented Apr 2, 2026

image Seems like the chi angles are missing for UDC strategies, has the database been overwritten or am I missing something?

@ndg63276
Copy link
Copy Markdown
Collaborator Author

ndg63276 commented Apr 2, 2026

Hmmm... that's not right. Mine still shows the chi angles...
image
Has the front end been re-built?

@gfrn
Copy link
Copy Markdown
Collaborator

gfrn commented Apr 7, 2026

Although I ran it thrice, it was probably cached and didn't get picked up, it worked today for some reason... I'll hit approve on it

@ndg63276 ndg63276 changed the base branch from master to pre-release/2026-R2.3 April 21, 2026 08:54
@ndg63276 ndg63276 merged commit bbb5f16 into pre-release/2026-R2.3 Apr 21, 2026
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-2126/new-strategy-pipeline branch April 21, 2026 08:56
ndg63276 added a commit that referenced this pull request May 1, 2026
* Add instruction for industry users (#1063)

* LIMS-1949: Use parentAutoProcProgramId field (#1062)

* LIMS-1949: Use parentAutoProcProgramId field

* LIMS-1949: Add config variable to example file

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-2109: Require an email address when creating a plate (#1037)

* LIMS-2109: Require an email address when creating a plate

* Update php-jwt as much as possible and ignore security advisory

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-2126: Add new strategy pipeline and tidy code (#1054)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-2135: Update PHP Libraries (#1053)

* LIMS-2135: Update PHP Libraries

* LIMS-2135: Update tests for PHP 7.4.33

* LIMS-2135: Use global getallheaders

* LIMS-2135: Fix unit tests

* LIMS-2135: Fix unit tests

* LIMS-2135: Add bootstrap getallheaders function for CI tests

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-2136: Fix editing priority processing pipeline (#1057)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-2139: Dont display special beam as beam dumps (#1052)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-2163: Notation change to dispensing CSV for 2 drop plates

---------

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
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