-
Notifications
You must be signed in to change notification settings - Fork 145
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
ARINA read #455
ARINA read #455
Conversation
This PR includes
Reading 2D calibrations requires the patches in PR 462 |
There was a problem hiding this 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 a few things that could use editing. There are going to be merge conflicts, I can take a stab at handling those and building tests for the new readers
|
||
elif len(data.shape) == 2: | ||
if units[0] == b"mrad": | ||
diffraction = VirtualDiffraction(data=data) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here and on line 71, I'd recommend using DiffractionSlice
and RealSlice
rather than VirtualDiffraction and VirtualImage. The former are the more general classes for diffraction and real space shaped objects, and the latter are these (i.e. they inherit from the Slices) plus are more specifically generated by our virtual imaging and virtual diffraction methods
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
are there any syntactically meaningful edits to this file, or is it all just reformatting? It appears to be done with an autoformatter...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just autoformatter
py4DSTEM/process/virtualimage.py
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same comment as for virtualdiffraction.py
Ok, I've merged the dev head into this branch, fixed consequent merge conflicts and import errors, added the arina test file to the test suite test file downloader with the rest of the io test bundle, and added a unit test file for the arina reader. So the infrastructure for the arina file reader should be in place. Do have have one or two test files you'd like to use for the abTEM reader? (two if you'd like to test both the 4D and 2D use cases). If so we can add those to the test suite as well. When I ran the arina reader I hit an error - here's the traceback:
Seems like it found and read the master file but then had trouble reading the first data file! |
Thanks Ben! I'm having trouble recreating that error you posted. This just worked for me:
|
Added the correction option, so I think this should be ready now |
No description provided.