fix: updates for fixtures and tools

Author: yucongalicechen

src/diffpy/labpdfproc/tools.py

@@ -1,9 +1,8 @@
 import copy
 from pathlib import Path
 
-from diffpy.labpdfproc.mud_calculator import compute_mud
-from diffpy.utils.scattering_objects.diffraction_objects import QQUANTITIES, XQUANTITIES
-from diffpy.utils.tools import get_package_info, get_user_info
+from diffpy.utils.diffraction_objects import ANGLEQUANTITIES, QQUANTITIES, XQUANTITIES
+from diffpy.utils.tools import compute_mud, get_package_info, get_user_info
 
 WAVELENGTHS = {"Mo": 0.71, "Ag": 0.59, "Cu": 1.54}
 known_sources = [key for key in WAVELENGTHS.keys()]
@@ -154,7 +153,9 @@ def set_xtype(args):
     """
     if args.xtype.lower() not in XQUANTITIES:
         raise ValueError(f"Unknown xtype: {args.xtype}. Allowed xtypes are {*XQUANTITIES, }.")
-    args.xtype = "q" if args.xtype.lower() in QQUANTITIES else "tth"
+    args.xtype = (
+        "q" if args.xtype.lower() in QQUANTITIES else "tth" if args.xtype.lower() in ANGLEQUANTITIES else "d"
+    )
     return args
 
 
@@ -236,10 +237,9 @@ def load_user_info(args):
     the updated argparse Namespace with username and email inserted
 
     """
-    config = {"username": args.username, "email": args.email}
-    config = get_user_info(config)
-    args.username = config["username"]
-    args.email = config["email"]
+    config = get_user_info(owner_name=args.username, owner_email=args.email)
+    args.username = config["owner_name"]
+    args.email = config["owner_email"]
     return args
 
 

tests/test_fixtures.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from diffpy.utils.parsers import loadData
+from diffpy.utils.parsers.loaddata import loadData
 
 
 # Test that our readable and unreadable files are indeed readable and

tests/test_tools.py

@@ -18,7 +18,7 @@
     set_wavelength,
     set_xtype,
 )
-from diffpy.utils.scattering_objects.diffraction_objects import XQUANTITIES
+from diffpy.utils.diffraction_objects import XQUANTITIES
 
 # Use cases can be found here: https://github.com/diffpy/diffpy.labpdfproc/issues/48
 
@@ -194,7 +194,7 @@ def test_set_wavelength_bad(inputs, msg):
 params4 = [
     ([], ["tth"]),
     (["--xtype", "2theta"], ["tth"]),
-    (["--xtype", "d"], ["tth"]),
+    (["--xtype", "d"], ["d"]),
     (["--xtype", "q"], ["q"]),
 ]