diff --git a/diffpy/labpdfproc/functions.py b/diffpy/labpdfproc/functions.py index 1939fb5..2db6da3 100644 --- a/diffpy/labpdfproc/functions.py +++ b/diffpy/labpdfproc/functions.py @@ -1,10 +1,10 @@ -import numpy as np +from diffpy.utils.scattering_objects.diffraction_objects import Diffraction_object wavelengths = {"Mo": 0.7107, "Ag": 0.59} def compute_cve(diffraction_data, mud, wavelength): # for a given mu and d and lambda, we will compute cve on a tth grid # something arbitrary for the moment - cve = diffpy.utils.DiffractionObject() + cve = Diffraction_object() cve_x = diffraction_data.on_tth[0] cve_y = cve_x * mud * wavelength cve.insert_scattering_quantity(cve_x, cve_y, "tth", metadata={ }) diff --git a/diffpy/labpdfproc/labpdfprocapp.py b/diffpy/labpdfproc/labpdfprocapp.py index b37615e..7977b58 100644 --- a/diffpy/labpdfproc/labpdfprocapp.py +++ b/diffpy/labpdfproc/labpdfprocapp.py @@ -3,7 +3,7 @@ from diffpy.labpdfproc.functions import compute_cve, apply_corr, wavelengths from diffpy.utils.parsers.loaddata import loadData -from diffpy.utils.scattering_objects import DiffractionObject +from diffpy.utils.scattering_objects.diffraction_objects import Diffraction_object known_sources = ["Ag", "Mo"] @@ -51,7 +51,7 @@ def main(): args = get_args() wavelength = wavelengths[args.anode_type] - input_pattern = DiffractionObject() + input_pattern = Diffraction_object() xarray, yarray = loadData(args.data_file, unpack=True) input_pattern.insert_scattering_quantity(xarray, yarray, "tth", metadata={ })