Skip to content

compute mu #278

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

Merged
merged 15 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions news/mu.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* function to compute x-ray attenuation coefficient (mu) using XrayDB

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* <news item>

**Security:**

* <news item>
1 change: 1 addition & 0 deletions requirements/conda.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
numpy
xraydb
1 change: 1 addition & 0 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
numpy
xraydb
52 changes: 52 additions & 0 deletions src/diffpy/utils/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from copy import copy
from pathlib import Path

from xraydb import material_mu


def clean_dict(obj):
"""Remove keys from the dictionary where the corresponding value is None.
Expand Down Expand Up @@ -206,3 +208,53 @@ def get_package_info(package_names, metadata=None):
pkg_info.update({package: importlib.metadata.version(package)})
metadata["package_info"] = pkg_info
return metadata


def get_density_from_cloud(sample_composition, mp_token=""):
"""Function to get material density from the MP or COD database.

It is not implemented yet.
"""
raise NotImplementedError(
"So sorry, density computation from composition is not implemented right now. "
"We hope to have this implemented in the next release. "
"Please rerun specifying a sample mass density."
)


def compute_mu_using_xraydb(sample_composition, energy, sample_mass_density=None, packing_fraction=None):
"""Compute the attenuation coefficient (mu) using the XrayDB database.

Computes mu based on the sample composition and energy.
User should provide a sample mass density or a packing fraction.
If neither density nor packing fraction is specified, or if both are specified, a ValueError will be raised.
Reference: https://xraypy.github.io/XrayDB/python.html#xraydb.material_mu.

Parameters
----------
sample_composition : str
The chemical formula or the name of the material.
Copy link
Contributor

Choose a reason for hiding this comment

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

not the name, just chemical formula.

energy : float
The energy of the incident x-rays in keV.
sample_mass_density : float, optional, Default is None
The mass density of the packed powder/sample in gr/cm^3.
Copy link
Contributor

Choose a reason for hiding this comment

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

g/cm*3, not gr/cm^3

packing_fraction : float, optional, Default is None
The fraction of sample in the capillary (between 0 and 1).

Returns
-------
mu : float
The attenuation coefficient mu in mm^{-1}.
"""
if (sample_mass_density is None and packing_fraction is None) or (
sample_mass_density is not None and packing_fraction is not None
):
raise ValueError(
"You must specify either sample_mass_density or packing_fraction, but not both. "
"Please rerun specifying only one."
)
if packing_fraction is not None:
sample_mass_density = get_density_from_cloud(sample_composition) * packing_fraction
energy_eV = energy * 1000
mu = material_mu(sample_composition, energy_eV, density=sample_mass_density, kind="total") / 10
return mu
36 changes: 35 additions & 1 deletion tests/test_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@

import pytest

from diffpy.utils.tools import check_and_build_global_config, get_package_info, get_user_info
from diffpy.utils.tools import (
check_and_build_global_config,
compute_mu_using_xraydb,
get_package_info,
get_user_info,
)


@pytest.mark.parametrize(
Expand Down Expand Up @@ -160,3 +165,32 @@ def test_get_package_info(monkeypatch, inputs, expected):
)
actual_metadata = get_package_info(inputs[0], metadata=inputs[1])
assert actual_metadata == expected


@pytest.mark.parametrize(
"inputs",
[
# Test when the function has invalid inputs
( # C1: Both mass density and packing fraction are provided, expect ValueError exception
{
"sample_composition": "SiO2",
"energy": 10,
"sample_mass_density": 2.65,
"packing_fraction": 1,
}
),
( # C2: None of mass density or packing fraction are provided, expect ValueError exception
{
"sample_composition": "SiO2",
"energy": 10,
}
),
],
)
def test_compute_mu_using_xraydb_bad(inputs):
with pytest.raises(
ValueError,
match="You must specify either sample_mass_density or packing_fraction, but not both. "
"Please rerun specifying only one.",
):
compute_mu_using_xraydb(**inputs)
Loading