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-121: Allow use of VMXm Gridboxes and Cartridges #732

Conversation

ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-121

Summary:

For VMXm to use ISPyB, we need to support their gridboxes (4 samples) and cartridges (5 samples). The expected workflow is to create multiple gridboxes with samples, and also one or more empty cartridges. Samples are then moved from the gridbox to a cartridge for loading on the beamline.

Changes:

  • Allow creation of empty containers
  • Add schematic drawings of VMXm-GridBox, VMXm-Cartridge, and also Block-4 as used on i23.
  • Allow viewing of VMXm container types as "pucks" (not "plates")
  • Pass in and display drawings of different container types. Define/update sample positions to match the drawings.
  • Fix bug where changing container type to a new one of the same capacity wouldn't update the drawing, by adding NAME to the initial container type

To test:

  • Add the 2 new container types to the database with:
insert into ContainerType (name, proposalType, capacity) values ('VMXm-Cartridge', 'mx', 5), ('VMXm-GridBox' ,'mx', 4);
  • Create a shipment and then click Add Container
  • Check puck image appears, including Mickey Mouse style ears in the middle
  • Switch container type to Block-4, check square image appears and sample numbers appear
  • Switch container type to VMXm-GridBox, check round image appears and sample numbers appear
  • Name the grid box and add some samples to it, click Add Container, check it goes into the database
  • Create another container in the same shipment, but use container type of cartridge. Check correct drawing appears.
  • Dont add any samples to the cartridge, click Add Container, check no errors appear.
  • Go back to the gridbox, click on the arrows to move a sample to the cartridge, check the sample moves ok.

@ndg63276 ndg63276 changed the title Improvement/lims 121/allow use of vmxm gridboxes and cartridges LIMS-121: Allow use of VMXm Gridboxes and Cartridges Feb 20, 2024
@ndg63276 ndg63276 changed the base branch from prerelease to master June 24, 2024 09:36
@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R3.2 July 9, 2024 11:54
@ndg63276 ndg63276 merged commit ce82eab into pre-release/2024-R3.2 Jul 9, 2024
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-121/allow-use-of-vmxm-gridboxes-and-cartridges branch July 9, 2024 12:01
ndg63276 added a commit that referenced this pull request Jul 23, 2024
* LIMS-1319: Show dose for all data collection types (#791)

* LIMS-954: Add ability to edit manufacturer serial no on dewars (#652)

* LIMS-1276: Add printed date to shipping labels (#755)

* LIMS-902: Clear sessionId from containers when requesting a dewar transfer (#673)

* LIMS-277: Fix sample changer view scaling (#794)

* LIMS-121: Allow use of VMXm Gridboxes and Cartridges (#732)

* LIMS-1257: Allow population of source fields (#769)

* LIMS-1382: Add message to users about using the shipping service (#801)

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
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