Skip to content

LIMS-1529: Fix fast ep model viewer#858

Merged
ndg63276 merged 1 commit into
pre-release/2024-R5.2from
fix/LIMS-1529/fix-fast-ep-model-viewer
Nov 12, 2024
Merged

LIMS-1529: Fix fast ep model viewer#858
ndg63276 merged 1 commit into
pre-release/2024-R5.2from
fix/LIMS-1529/fix-fast-ep-model-viewer

Conversation

@ndg63276
Copy link
Copy Markdown
Collaborator

@ndg63276 ndg63276 commented Nov 6, 2024

JIRA ticket: LIMS-1529

Summary:

#821 introduced a bug where the CCP4 path was set correctly for Dimple and MrBump, but not for Fast EP jobs, so the mtz2map conversion would fail and the map would not load.

Changes:

  • Move the setting of $CCP4_MASTER etc out of the if clause

To test:

  • EDIT: Make sure to set $ccp4_location = '/dls_sw/apps/ccp4/latest/ccp4-9'; in your config.php file
  • Go to a data collection with Dimple, MrBump and Fast EP results eg /dc/visit/cm37235-4/id/15531187
  • Go to each downstream pipeline in turn and click "Map/Model Viewer", check that some electron density appears and no errors occur.

@gfrn
Copy link
Copy Markdown
Collaborator

gfrn commented Nov 6, 2024

https://local-oidc-test.diamond.ac.uk:8082/dc/map/id/15531187/aid/106290688 returns a 400 for me, is this expected? All others work flawlessly

@ndg63276
Copy link
Copy Markdown
Collaborator Author

ndg63276 commented Nov 6, 2024

https://local-oidc-test.diamond.ac.uk:8082/dc/map/id/15531187/aid/106290688 returns a 400 for me, is this expected? All others work flawlessly

Hmmm... not expected... works for me...

EDIT: Probably the config variable, have added to the instructions.

@gfrn
Copy link
Copy Markdown
Collaborator

gfrn commented Nov 7, 2024

I've updated the configuration, it all seems to work now! Thank you!

@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R5.2 November 12, 2024 10:04
@ndg63276 ndg63276 merged commit bb2f836 into pre-release/2024-R5.2 Nov 12, 2024
@ndg63276 ndg63276 deleted the fix/LIMS-1529/fix-fast-ep-model-viewer branch November 12, 2024 10:07
ndg63276 added a commit that referenced this pull request Dec 16, 2024
…882)

* LIMS-1498: Change name of processed data archive (#855)

* LIMS-1469: Fix download button on old summary page (#840)

* LIMS-1463: Always display Mesh3D data collections as grid scans (#845)

* LIMS-1515: Add energy value to data collections (#853)

* LIMS-261: Allow download of PDB files (#857)

* LIMS-1529: Fix fast ep model viewer (#858)

* LIMS-753: Allow LN2 topups as part of dewar history (#856)

* LIMS-1530: Add To Queue Fails when Not Completed filter applied (#864)

* LIMS-1530: Add To Queue Fails when Not Completed filter applied

* LIMS-1552: Remove old jquery (#871)

* LIMS-1500: Set the dispatch request email recipients based on the dewar barcode (#848)

* LIMS-1458: Fix GitHub warnings (#841)

---------

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