-
Notifications
You must be signed in to change notification settings - Fork 64
Improve TEMDiffractionComponent
to use py4DSTEM
#285
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
Conversation
I had to rebuild the |
Just having a read over this PR, it looks excellent! Announcement to follow, but I will be giving all collaborators (e.g., paper co-authors) permissions to merge their own PRs, to help make the project feel more collaborative and reduce delays -- as project maintainer I'll still keep an eye on which PRs are being merged and review major changes before release. That said, since this is your first PR, I will still be glad to do a full review for this if helpful! |
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
@mkhorton I am happy with how the TEM component is looking now, so I took this out of draft status, and I think it is ready for review. At the moment the build seems to be failing for reasons I don't understand, but which also don't seem to be related to the TEM component, so I'll need some help on that. |
TEMDiffractionComponent
to use py4DSTEMTEMDiffractionComponent
to use py4DSTEM
Hi @sezelt, thanks for your patience while this sat in review. I'm happy to merge (the merge conflicts are minor and I can resolve these). However, the only issue I'm having is with py4DSTEM installation -- installation via Attaching screenshot for posterity. Functionality-wise this seems perfect, and very well integrated into the existing code-base, so thank you! |
Ah, I don't have permissions to resolve this merge conflict myself. Essentially, the merge conflicts are trivial, you should use |
Once the merge conflict is resolved, please go ahead and merge! As a contributor, I've given you write access to this repository. The PR is definitely ready 👍 In terms for getting this deployed on Materials Project, I'll have to discuss with @tschaume et al. about the |
Awesome! I think I got everything right in fixing the merge conflicts, so I'm going to go ahead and merge this in now. |
Thanks for the merge @sezelt! |
Following #259, update
TEMDiffractionComponent
to use py4DSTEM for diffraction calculations.Tasks (adapted from the original issue):
py4DSTEM
to (optional) project requirements and ensure test suite still passesPyQt5
, which is fine on my desktop but breaks install on an ARM Mac and may(?) not work on the MP servers.PyQt5
is not needed for the functionality we use here, so if need be we can make it optional in upstream py4DSTEM.TEMDiffractionComponent
to usepy4DSTEM
crystal_toolkit.apps.examles
so that this can be incorporated into the test suite and documentation