corrected mu vs muD usage, remove packing fraction option

Author: yucongalicechen

news/remove-packing-fraction.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

src/diffpy/labpdfproc/labpdfprocapp.py

@@ -12,13 +12,6 @@
 from diffpy.utils.diffraction_objects import XQUANTITIES, DiffractionObject
 from diffpy.utils.parsers.loaddata import loadData
 
-theoretical_mud_hmsg_suffix = (
-    "in that exact order, "
-    "separated by commas (e.g., ZrO2,17.45,0.5). "
-    "If you add whitespaces, "
-    "enclose it in quotes (e.g., 'ZrO2, 17.45, 0.5'). "
-)
-
 
 def _define_arguments():
     args = [
@@ -163,45 +156,38 @@ def _add_mud_selection_group(p, is_gui=False):
     1. Manually enter muD (`--mud`).
     2. Estimate from a z-scan file (`-z` or `--z-scan-file`).
     3. Estimate theoretically based on sample mass density
-    (`-d` or `--theoretical-from-density`).
-    4. Estimate theoretically based on packing fraction
-    (`-p` or `--theoretical-from-packing`).
+    (`-t` or `--theoretical-estimation`).
     """
-    g = p.add_argument_group("Options for setting mu*D value (Required)")
+    g = p.add_argument_group("Options for setting muD value (Required)")
     g = g.add_mutually_exclusive_group(required=True)
     g.add_argument(
         "--mud",
         type=float,
-        help="Enter the mu*D value manually.",
+        help="Enter the muD value manually.",
         **({"widget": "DecimalField"} if is_gui else {}),
     )
     g.add_argument(
         "-z",
         "--z-scan-file",
         help=(
-            "Estimate mu*D experimentally from a z-scan file. "
+            "Estimate muD experimentally from a z-scan file. "
             "Specify the path to the file "
             "used to compute the mu*D value."
         ),
         **({"widget": "FileChooser"} if is_gui else {}),
     )
     g.add_argument(
-        "-d",
-        "--theoretical-from-density",
-        help=(
-            "Estimate mu*D theoretically using sample mass density. "
-            "Specify the chemical formula, incident x-ray energy (in keV), "
-            "and sample mass density (in g/cm^3), "
-            + theoretical_mud_hmsg_suffix
-        ),
-    )
-    g.add_argument(
-        "-p",
-        "--theoretical-from-packing",
+        "-t",
+        "--theoretical-estimation",
         help=(
-            "Estimate mu*D theoretically using packing fraction. "
+            "Estimate muD theoretically. "
             "Specify the chemical formula, incident x-ray energy (in keV), "
-            "and packing fraction (0 to 1), " + theoretical_mud_hmsg_suffix
+            "sample mass density (in g/cm^3), "
+            "and capillary diameter (in mm) "
+            "in that exact order, "
+            "separated by commas (e.g., ZrO2,17.45,0.5,1.0). "
+            "If you add whitespaces, "
+            "enclose it in quotes (e.g., 'ZrO2, 17.45, 0.5, 1.0'). "
         ),
     )
     return p

src/diffpy/labpdfproc/tools.py

@@ -34,17 +34,15 @@
 
 # Exclude wavelength to avoid duplication,
 # as it's written explicitly by diffpy.utils dump function.
-# Exclude "theoretical_from_density" and "theoretical_from_packing"
-# as they are only used for theoretical mu*D estimation
-# and will be written into separate arguments for clarity.
+# Exclude "theoretical_estimation"
+# as it will be written into separate arguments for clarity.
 METADATA_KEYS_TO_EXCLUDE = [
     "output_correction",
     "force_overwrite",
     "input",
     "input_paths",
     "wavelength",
-    "theoretical_from_density",
-    "theoretical_from_packing",
+    "theoretical_estimation",
 ]
 
 
@@ -320,49 +318,37 @@ def _set_mud_from_zscan(args):
 def _parse_theoretical_input(input_str):
     """Helper function to parse and validate the input string."""
     parts = [part.strip() for part in input_str.split(",")]
-    if len(parts) != 3:
+    if len(parts) != 4:
         raise ValueError(
-            f"Invalid mu*D input '{input_str}'. "
+            f"Invalid muD input '{input_str}'. "
             "Expected format is 'sample composition, energy, "
-            "sample mass density or packing fraction' "
-            "(e.g., 'ZrO2,17.45,0.5').",
+            "sample mass density, diameter' "
+            "(e.g., 'ZrO2,17.45,0.5,1.0').",
         )
     sample_composition = parts[0]
     energy = float(parts[1])
-    mass_density_or_packing_fraction = float(parts[2])
-    return sample_composition, energy, mass_density_or_packing_fraction
+    sample_mass_density = float(parts[2])
+    diameter = float(parts[3])
+    return sample_composition, energy, sample_mass_density, diameter
 
 
-def _set_theoretical_mud_from_density(args):
+def _set_theoretical_mud(args):
     """Theoretical estimation of mu*D from
-    sample composition, energy, and sample mass density."""
-    sample_composition, energy, sample_mass_density = _parse_theoretical_input(
-        args.theoretical_from_density
+    sample composition, energy, sample mass density, and capillary diameter"""
+    sample_composition, energy, sample_mass_density, diameter = (
+        _parse_theoretical_input(args.theoretical_estimation)
     )
     args.sample_composition = sample_composition
     args.energy = energy
     args.sample_mass_density = sample_mass_density
-    args.mud = compute_mu_using_xraydb(
-        args.sample_composition,
-        args.energy,
-        sample_mass_density=args.sample_mass_density,
-    )
-    return args
-
-
-def _set_theoretical_mud_from_packing(args):
-    """Theoretical estimation of mu*D from
-    sample composition, energy, and packing fraction."""
-    sample_composition, energy, packing_fraction = _parse_theoretical_input(
-        args.theoretical_from_packing
-    )
-    args.sample_composition = sample_composition
-    args.energy = energy
-    args.packing_fraction = packing_fraction
-    args.mud = compute_mu_using_xraydb(
-        args.sample_composition,
-        args.energy,
-        packing_fraction=args.packing_fraction,
+    args.diameter = diameter
+    args.mud = (
+        compute_mu_using_xraydb(
+            args.sample_composition,
+            args.energy,
+            sample_mass_density=args.sample_mass_density,
+        )
+        * args.diameter
     )
     return args
 
@@ -373,8 +359,7 @@ def set_mud(args):
     Options include:
     1. Manually entering a value.
     2. Estimating from a z-scan file.
-    3. Estimating theoretically based on sample mass density.
-    4. Estimating theoretically based on packing fraction.
+    3. Estimating theoretically based on relevant chemical info.
 
     Parameters
     ----------
@@ -384,14 +369,12 @@ def set_mud(args):
     Returns
     -------
     args : argparse.Namespace
-        The updated arguments with mu*D.
+        The updated arguments with muD.
     """
     if args.z_scan_file:
         return _set_mud_from_zscan(args)
-    elif args.theoretical_from_density:
-        return _set_theoretical_mud_from_density(args)
-    elif args.theoretical_from_packing:
-        return _set_theoretical_mud_from_packing(args)
+    elif args.theoretical_estimation:
+        return _set_theoretical_mud(args)
     return args
 
 

tests/test_tools.py

@@ -461,14 +461,10 @@ def test_set_xtype_bad():
         # C2: user provides a z-scan file, expect to estimate through the file
         (["--z-scan-file", "test_dir/testfile.xy"], 3),
         # C3: user specifies sample composition, energy,
-        # and sample mass density,
+        # sample mass density, and diameter
         # both with and without whitespaces, expect to estimate theoretically
-        (["--theoretical-from-density", "ZrO2,17.45,1.2"], 1.49),
-        (["--theoretical-from-density", "ZrO2, 17.45, 1.2"], 1.49),
-        # C4: user specifies sample composition, energy, and packing fraction
-        # both with and without whitespaces, expect to estimate theoretically
-        # (["--theoretical-from-packing", "ZrO2,17.45,0.3"], 1.49),
-        # (["--theoretical-from-packing", "ZrO2, 17.45, 0.3"], 1.49),
+        (["--theoretical-estimation", "ZrO2,17.45,1.2,1.0"], 1.49),
+        (["--theoretical-estimation", "ZrO2, 17.45, 1.2, 1.0"], 1.49),
     ],
 )
 def test_set_mud(user_filesystem, inputs, expected_mud):
@@ -492,56 +488,28 @@ def test_set_mud(user_filesystem, inputs, expected_mud):
                 "Cannot find invalid file. Please specify a valid file path.",
             ],
         ),
-        # C2.1: (sample mass density option)
-        # user provides fewer than three input values
-        # expect ValueError with a message indicating the correct format
-        (
-            ["--theoretical-from-density", "ZrO2,0.5"],
-            [
-                ValueError,
-                "Invalid mu*D input 'ZrO2,0.5'. "
-                "Expected format is 'sample composition, energy, "
-                "sample mass density or packing fraction' "
-                "(e.g., 'ZrO2,17.45,0.5').",
-            ],
-        ),
-        # C2.2: (packing fraction option)
-        # user provides fewer than three input values
-        # expect ValueError with a message indicating the correct format
-        (
-            ["--theoretical-from-packing", "ZrO2,0.5"],
-            [
-                ValueError,
-                "Invalid mu*D input 'ZrO2,0.5'. "
-                "Expected format is 'sample composition, energy, "
-                "sample mass density or packing fraction' "
-                "(e.g., 'ZrO2,17.45,0.5').",
-            ],
-        ),
-        # C3.1: (sample mass density option)
-        # user provides more than 3 input values
+        # C2: user provides fewer than 4 inputs for theoretical estimation,
         # expect ValueError with a message indicating the correct format
         (
-            ["--theoretical-from-density", "ZrO2,17.45,1.5,0.5"],
+            ["--theoretical-estimation", "ZrO2,0.5"],
             [
                 ValueError,
-                "Invalid mu*D input 'ZrO2,17.45,1.5,0.5'. "
+                "Invalid muD input 'ZrO2,0.5'. "
                 "Expected format is 'sample composition, energy, "
-                "sample mass density or packing fraction' "
-                "(e.g., 'ZrO2,17.45,0.5').",
+                "sample mass density, diameter' "
+                "(e.g., 'ZrO2,17.45,0.5,1.0').",
             ],
         ),
-        # C3.2: (packing fraction option)
-        # user provides more than 3 input values
+        # C3: user provides more than 4 inputs for theoretical estimation,
         # expect ValueError with a message indicating the correct format
         (
-            ["--theoretical-from-packing", "ZrO2,17.45,1.5,0.5"],
+            ["--theoretical-estimation", "ZrO2,17.45,1.5,0.5,1.0"],
             [
                 ValueError,
-                "Invalid mu*D input 'ZrO2,17.45,1.5,0.5'. "
+                "Invalid muD input 'ZrO2,17.45,1.5,0.5,1.0'. "
                 "Expected format is 'sample composition, energy, "
-                "sample mass density or packing fraction' "
-                "(e.g., 'ZrO2,17.45,0.5').",
+                "sample mass density, diameter' "
+                "(e.g., 'ZrO2,17.45,0.5,1.0').",
             ],
         ),
     ],