-
Notifications
You must be signed in to change notification settings - Fork 23
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
Fix mrc bugs #131
Fix mrc bugs #131
Conversation
pre-commit.ci autofix |
DOes this PR also fix #130? |
rsciio/mrc/_api.py
Outdated
@@ -188,20 +193,20 @@ def file_reader(filename, lazy=False, mmap_mode=None, endianess="<", **kwds): | |||
if fei_header is None: | |||
# The scale is in Amstrongs, we convert it to nm |
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.
# The scale is in Amstrongs, we convert it to nm | |
# The scale is in Angstroms, we convert it to nm |
:-)
@ericpre can you rebase to throw out the unrelated changes and ease the review. |
There is one more that I need to do here is add an option to specify the navigation shape, because in case of 4D-STEM data saved by Velox, the data seems to be saved as a stack even if the MRC2014 specification supports it - this is consistent with the way mrcfile reads the data. |
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #131 +/- ##
==========================================
+ Coverage 85.01% 85.33% +0.32%
==========================================
Files 73 73
Lines 9062 9076 +14
Branches 2049 2053 +4
==========================================
+ Hits 7704 7745 +41
+ Misses 893 860 -33
- Partials 465 471 +6
☔ View full report in Codecov by Sentry. |
Yes, it does! :) |
The failure of the "Test Packaging" build is expected because it downloads the test files from the |
Would it make sense to add the non-FEI test file from #96 to the tests? |
Yes, |
While I was at it, improve the documentation to close #93! :) |
… the navigation space
Well one of the current test files is 32 MB, so larger than the 4.5 MB one from #96, but I don't know if could replace that one. |
Sorry, there is a typo in my message and anyway I wasn't very clear! What I should have say to explain my reasoning is:
|
…file using the `mrcz` plugin
I would suggest to add other type of mrc files (one from the type in #91) in another PR, once we have got smallest possible file. |
Fix #71, #91, #93, #96, #130 and some of #60.
Currently including #129 to test updating registry from pull request
Progress of the PR
upcoming_changes
folder (seeupcoming_changes/README.rst
),readthedocs
doc build of this PR (link in github checks)