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

Use correct number of dimension names in Xspress3ExternalFileReference #175

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

jmaruland
Copy link

This PR fixes an error that was identified in bluesky/databroker#793 during tests for the Data Security project at SRX.
The error was tracked from tiled, back to databoker and last here where the default information of the dimensions of an Xspress3ExternalFileReference was being saved in a BlueSky document and this was causing an error while using this information and data to create an array in an xarray.Dataset.
The definition of dim_name was modified which considers the correct dimensions of the array and fixes the error when xarrays are generated in databroker.
The original use of dim_name was kept for cases where backwards compatibility is necessary.

nslsii/areadetector/xspress3.py Outdated Show resolved Hide resolved
nslsii/areadetector/xspress3.py Show resolved Hide resolved
@jmaruland
Copy link
Author

@mrakitin Can you review and merge this for me, please?
I added Dan's reviews already.

Copy link
Member

@mrakitin mrakitin left a comment

Choose a reason for hiding this comment

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

Looks good overall, just added a couple of non-blocking comments.

nslsii/tests/test_xspress3.py Outdated Show resolved Hide resolved
nslsii/areadetector/xspress3.py Outdated Show resolved Hide resolved
nslsii/areadetector/xspress3.py Show resolved Hide resolved
@danielballan danielballan changed the title Optimize initialization of Xspress3ExternalFileReference Use correct number of dimension names in Xspress3ExternalFileReference May 31, 2024
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.

3 participants