Skip to content

LIMS-1687: Remove references to GridInfo.pixelsPerMicronX/Y#926

Merged
ndg63276 merged 3 commits intopre-release/2025-R2.5from
improvement/LIMS-1687/remove-refs-to-pixelsPerMicron
May 6, 2025
Merged

LIMS-1687: Remove references to GridInfo.pixelsPerMicronX/Y#926
ndg63276 merged 3 commits intopre-release/2025-R2.5from
improvement/LIMS-1687/remove-refs-to-pixelsPerMicron

Conversation

@ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-1687

Summary:

A couple of years ago we discovered we had been confusing pixelsPerMicron and micronsPerPixel. We have now committed to only populating micronsPerPixel, and all values from pixelsPerMicron have been copied over. PR #517 was used to prefer micronsPerPixel, with a fallback to pixelsPerMicron. This PR is to remove that fallback as it is no longer necessary.

Changes:

  • Read GridInfo.micronsPerPixelX and GridInfo.micronsPerPixelY directly, without the IFNULL fallback.

To test:

  • Open a grid scan, check the snapshots look ok (eg /dc/visit/cm33866-1/id/10222112)
  • Check the network request to /api/dc/grid/10222112?prop=cm33866 returns an object with
    "MICRONSPERPIXELX": 0.806,
    "MICRONSPERPIXELY": 0.806,

@gfrn
Copy link
Collaborator

gfrn commented Apr 25, 2025

Is it worth updating api/docs/db/DataCollections.md (line 92) and api/docs/definitions/gridinfo.yaml (line 43)? Not sure anyone references these files, but...

@gfrn gfrn self-requested a review April 25, 2025 12:51
@ndg63276
Copy link
Collaborator Author

Is it worth updating api/docs/db/DataCollections.md (line 92) and api/docs/definitions/gridinfo.yaml (line 43)? Not sure anyone references these files, but...

Good plan, I think that's all the references in api/docs/

@ndg63276 ndg63276 changed the base branch from master to pre-release/2025-R2.5 May 6, 2025 09:43
@ndg63276 ndg63276 merged commit 0e8a5d4 into pre-release/2025-R2.5 May 6, 2025
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1687/remove-refs-to-pixelsPerMicron branch May 6, 2025 09:53
ndg63276 added a commit that referenced this pull request May 27, 2025
* LIMS-1648: Only display auto proc program attachment files where deleted column is 0 (#921)

* LIMS-1400: Remove logon stats page (#916)

* LIMS-1702: Rename Archive button to Download Zip (#930)

* LIMS-1719: Fix data collection comments button (#931)

* LIMS-1694: Allow beamlines to disable user assignment of pucks (#925)

* LIMS-1687: Remove references to GridInfo.pixelsPerMicronX/Y (#926)
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