change variable name from abdo to cve_do

Author: yucongalicechen

src/diffpy/labpdfproc/functions.py

@@ -201,8 +201,8 @@ def _cve_brute_force(diffraction_data, mud):
     muls = np.array(muls) / abs_correction.total_points_in_grid
     cve = 1 / muls
 
-    abdo = Diffraction_object(wavelength=diffraction_data.wavelength)
-    abdo.insert_scattering_quantity(
+    cve_do = Diffraction_object(wavelength=diffraction_data.wavelength)
+    cve_do.insert_scattering_quantity(
         TTH_GRID,
         cve,
         "tth",
@@ -211,7 +211,7 @@ def _cve_brute_force(diffraction_data, mud):
         wavelength=diffraction_data.wavelength,
         scat_quantity="cve",
     )
-    return abdo
+    return cve_do
 
 
 def _cve_polynomial_interpolation(diffraction_data, mud):
@@ -230,8 +230,8 @@ def _cve_polynomial_interpolation(diffraction_data, mud):
     muls = np.array(coeff_a * MULS**4 + coeff_b * MULS**3 + coeff_c * MULS**2 + coeff_d * MULS + coeff_e)
     cve = 1 / muls
 
-    abdo = Diffraction_object(wavelength=diffraction_data.wavelength)
-    abdo.insert_scattering_quantity(
+    cve_do = Diffraction_object(wavelength=diffraction_data.wavelength)
+    cve_do.insert_scattering_quantity(
         TTH_GRID,
         cve,
         "tth",
@@ -240,7 +240,7 @@ def _cve_polynomial_interpolation(diffraction_data, mud):
         wavelength=diffraction_data.wavelength,
         scat_quantity="cve",
     )
-    return abdo
+    return cve_do
 
 
 def _cve_method(method):
@@ -279,8 +279,8 @@ def compute_cve(diffraction_data, mud, method="polynomial_interpolation"):
     cve_on_global_tth = abdo_on_global_tth.on_tth[1]
     orig_grid = diffraction_data.on_tth[0]
     newcve = np.interp(orig_grid, global_tth, cve_on_global_tth)
-    abdo = Diffraction_object(wavelength=diffraction_data.wavelength)
-    abdo.insert_scattering_quantity(
+    cve_do = Diffraction_object(wavelength=diffraction_data.wavelength)
+    cve_do.insert_scattering_quantity(
         orig_grid,
         newcve,
         "tth",
@@ -290,7 +290,7 @@ def compute_cve(diffraction_data, mud, method="polynomial_interpolation"):
         scat_quantity="cve",
     )
 
-    return abdo
+    return cve_do
 
 
 def apply_corr(diffraction_pattern, absorption_correction):

src/diffpy/labpdfproc/tests/test_functions.py

@@ -75,14 +75,14 @@ def test_compute_cve(mocker):
     mocker.patch("diffpy.labpdfproc.functions.TTH_GRID", xarray)
     mocker.patch("numpy.interp", return_value=expected_cve)
     input_pattern = _instantiate_test_do(xarray, yarray)
-    actual_abdo = compute_cve(input_pattern, mud=1)
-    expected_abdo = _instantiate_test_do(
+    actual_cve_do = compute_cve(input_pattern, mud=1)
+    expected_cve_do = _instantiate_test_do(
         xarray,
         expected_cve,
         name="absorption correction, cve, for test",
         scat_quantity="cve",
     )
-    assert actual_abdo == expected_abdo
+    assert actual_cve_do == expected_cve_do
 
 
 def test_apply_corr(mocker):