update with updated wavelength function

Author: yucongalicechen

src/diffpy/labpdfproc/tests/test_tools.py

@@ -297,7 +297,7 @@ def _preprocess_args(args):
     args = load_user_info(args)
     args = set_input_lists(args)
     args.output_directory = set_output_directory(args)
-    args.wavelength = set_wavelength(args)
+    args = set_wavelength(args)
     args = load_user_metadata(args)
     return args
 
@@ -307,8 +307,6 @@ def test_load_metadata(mocker, user_filesystem):
     cli_inputs = [
         "2.5",
         ".",
-        "--wavelength",
-        "1.54",
         "--user-metadata",
         "key=value",
         "--username",
@@ -323,8 +321,8 @@ def test_load_metadata(mocker, user_filesystem):
         expected_metadata = {
             "mud": 2.5,
             "input_directory": str(filepath),
-            "anode_type": "Cu",
-            "wavelength": 1.54,
+            "anode_type": "Mo",
+            "wavelength": 0.71,
             "output_directory": str(Path.cwd().resolve()),
             "xtype": "tth",
             "key": "value",

src/diffpy/labpdfproc/tools.py

@@ -217,18 +217,9 @@ def load_package_info(args):
     return args
 
 
-def _set_anode_type(args):
-    if args.wavelength in WAVELENGTHS.values():
-        args.anode_type = next(key for key, value in WAVELENGTHS.items() if value == args.wavelength)
-    else:
-        delattr(args, "anode_type")
-    return args
-
-
 def load_metadata(args, filepath):
     """
-    Load metadata from args,
-    except for anode type if wavelength does not match, and do not load output_correction or force_overwrite
+    Load relevant metadata from args
 
     Parameters
     ----------
@@ -237,10 +228,9 @@ def load_metadata(args, filepath):
 
     Returns
     -------
-    A dictionary with all arguments from the parser
+    A dictionary with relevant arguments from the parser
     """
 
-    args = _set_anode_type(args)
     metadata = vars(args)
     for key in METADATA_KEYS_TO_EXCLUDE:
         metadata.pop(key, None)