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

compute_cve #92

Merged
merged 6 commits into from
Sep 6, 2024
Merged

compute_cve #92

merged 6 commits into from
Sep 6, 2024

Conversation

yucongalicechen
Copy link
Collaborator

Copy link
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

nicely done! There is one inline comment.

Also, codecov is failing. We need some tests for when things go wrong. This would be in a separate test called test_compute_cve_bad. These tests are not strictly necessary but definitely make the code better so let's do them while we are at it.

Let's also make an issue to replace the interpolation step with one using diffraction objects if that ever gets implemented. I think there should be an issue in diffpy.utils for that so link to that issue.

"-m",
"--method",
help=f"The method for computing absorption correction. Allowed methods: {*CVE_METHODS, }. "
f"Default method is polynomial interpolation if not specified. ",
Copy link
Contributor

Choose a reason for hiding this comment

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

I am worried about the indentation of this line. I am not sure if it will break things or not, but but it would be better indented to line up with the line above in any case.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

black seems to automatically adjust the indentation for all help messages and aligns them at help. I can try to add a paranthesis around the messages to make sure they line up with the lines above, if that's helpful?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've fixed the indentation issue in the latest commit. There are some conflicts with labpdfprocapp.py, but my local branch shows that the code is up-to-date when I try to merge from main to resolve conflicts. I think we can accept the edits for labpdfprocapp.py in this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

No, we have to fix it. Did you commit to main by mistake? That could cause this behavior

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Okay, I managed to resolve conflicts. I think it just needs me to merge from main again.

@sbillinge
Copy link
Contributor

@yucongalicechen one more thing, we need a news for this.

@sbillinge sbillinge merged commit 1dec001 into diffpy:main Sep 6, 2024
3 checks passed
@sbillinge
Copy link
Contributor

Nice, thanks!

@yucongalicechen yucongalicechen deleted the compute_cve branch September 6, 2024 13:23
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.

incorporate different cve computation methods to compute_cve
2 participants