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.

Sign up for GitHub

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

Jump to bottom

Fix string format for meta file #16

Merged
merged 1 commit into from
May 31, 2024
Merged

Fix string format for meta file #16

merged 1 commit into from
May 31, 2024
+36 −22

Conversation

DominicOram
Copy link
Contributor

@DominicOram DominicOram commented May 24, 2024 •
edited
Loading

See DiamondLightSource/ADOdin#21

I have confirmed this by doing the following:

  1. Using Add development environment #17 on top of this branch to write out a new meta file
  2. Copying that metafile into the hyperion tests at https://github.com/DiamondLightSource/hyperion/blob/main/tests/system_tests/external_interaction/test_nexgen.py which run them against imginfo
  3. Reverting https://github.com/DiamondLightSource/nexgen/pull/237/files

The tests then pass and imginfo is able to read the files

FYI @graeme-winter

@DominicOram DominicOram mentioned this pull request May 24, 2024
Open
@DominicOram
Copy link
Contributor Author

Scratch this, not sure imginfo is happy with it. Investigating

@DominicOram DominicOram marked this pull request as draft May 24, 2024 16:19
@DominicOram DominicOram marked this pull request as ready for review May 28, 2024 15:58
@GDYendell
Copy link
Collaborator

Happy with this in principle once we address the other surrounding issues and confirm everything works.

@DominicOram @GDYendell
Fix meta file datasets
0172dad 
Encode strings as ascii for compatibility
Fix some dataset types
@GDYendell GDYendell force-pushed the fix_hdf5_typing_on_meta_file branch from 8fe0c48 to 0172dad Compare May 31, 2024 10:56
@GDYendell
Copy link
Collaborator

Did a rebase (and squash) to pick up the CI build.

@GDYendell GDYendell merged commit 8ec5a8a into master May 31, 2024
16 checks passed
@GDYendell GDYendell deleted the fix_hdf5_typing_on_meta_file branch May 31, 2024 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GDYendell GDYendell Awaiting requested review from GDYendell

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DominicOram @GDYendell