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

Handle -ve rotations, null overlap in sm/DC #730

Merged
merged 3 commits into from
Feb 22, 2024

Conversation

ndevenish
Copy link
Contributor

@ndevenish ndevenish commented Feb 15, 2024

JIRA ticket: LIMS-1232

Summary:

I19 is now doing small molecule serial, where every other collection is run with backwards oscillation. Unfortunately, recording this accurately in ISPyB doesn't show the autoprocessing sections in Synchweb.

This changes the check to be truthy (nonzero) instead of purely positive.

Also fixes an adjacent issue where a null value for overlap was passing the intended non-zero check (null != 0). This is made truthy also.

Changes:

  • Altered data checks to check truthiness instead of comparisons to zero

To test:

I19 is now doing small molecule serial, where every other collection is
run with backwards oscillation. Unfortunately, recording this in the
database doesn't show the autoprocessing sections in Synchweb.

Change the check to be truthy (nonzero) instead of purely positive.

Also change an adjacent issue where a null value for overlap was passing
the intended non-zero check (null != 0).
Copy link
Collaborator

@ndg63276 ndg63276 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values appear to be strings, so even zeroes are truthy.

@ndevenish
Copy link
Contributor Author

This appears to work fine!
image

@ndg63276 ndg63276 changed the base branch from master to prerelease February 21, 2024 10:57
@ndg63276 ndg63276 merged commit c81907a into DiamondLightSource:prerelease Feb 22, 2024
2 checks passed
gfrn pushed a commit that referenced this pull request Feb 26, 2024
* Handle -ve rotations, null overlap in sm/DC

I19 is now doing small molecule serial, where every other collection is
run with backwards oscillation. Unfortunately, recording this in the
database doesn't show the autoprocessing sections in Synchweb.

Change the check to be truthy (nonzero) instead of purely positive.

Also change an adjacent issue where a null value for overlap was passing
the intended non-zero check (null != 0).

* Update client/src/js/templates/types/sm/dc/dc.html

Co-authored-by: Mark W <[email protected]>

* Update client/src/js/templates/types/sm/dc/dc.html

Co-authored-by: Mark W <[email protected]>

---------

Co-authored-by: Mark W <[email protected]>
@ndevenish ndevenish deleted the fix_sm_dc branch March 11, 2024 07:49
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