-
Notifications
You must be signed in to change notification settings - Fork 11
feat: getmud UC1 (get_diameter) #184
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
**Added:** | ||
|
||
* New ``getmuD`` module with ``get_diameter`` function to calculate capillary diameter. | ||
|
||
**Changed:** | ||
|
||
* <news item> | ||
|
||
**Deprecated:** | ||
|
||
* <news item> | ||
|
||
**Removed:** | ||
|
||
* <news item> | ||
|
||
**Fixed:** | ||
|
||
* <news item> | ||
|
||
**Security:** | ||
|
||
* <news item> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
from diffpy.utils.tools import compute_mu_using_xraydb | ||
|
||
|
||
def get_diameter( | ||
mud, | ||
sample_composition, | ||
xray_energy, | ||
sample_mass_density=None, | ||
packing_fraction=None, | ||
): | ||
""" | ||
Compute capillary diameter (mm) from muD, sample composition, energy, | ||
and either sample mass density or packing fraction. | ||
|
||
Parameters | ||
---------- | ||
mud : float | ||
The given muD of the sample. | ||
sample_composition : str | ||
The chemical formula of the material (e.g. "ZrO2"). | ||
xray_energy : float | ||
The energy of the incident x-rays in keV. | ||
sample_mass_density : float, optional | ||
The mass density of the packed sample in g/cm^3. | ||
packing_fraction : float, optional | ||
The packing fraction of the sample (0–1). | ||
|
||
Returns | ||
------- | ||
diameter : float | ||
Computed capillary diameter in mm. | ||
""" | ||
return mud / compute_mu_using_xraydb( | ||
sample_composition, | ||
xray_energy, | ||
sample_mass_density, | ||
packing_fraction, | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import pytest | ||
|
||
from diffpy.labpdfproc.getmud import get_diameter | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"inputs, expected_diameter", | ||
[ | ||
( # C1: User specifies target mud, | ||
# sample composition, energy, and mass density | ||
# expect to return diameter | ||
{ | ||
"mud": 2.0, | ||
"sample_composition": "ZrO2", | ||
"xray_energy": 17.45, | ||
"sample_mass_density": 1.20, | ||
}, | ||
1.3439, | ||
), | ||
], | ||
) | ||
def test_compute_diameter(inputs, expected_diameter): | ||
actual_diameter = get_diameter(**inputs) | ||
assert actual_diameter == pytest.approx( | ||
expected_diameter, rel=0.01, abs=0.1 | ||
) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Better format - use
compute_mu
function from diffpy.utils.