resolve conflicts

Author: yucongalicechen

news/compute_cve.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* polynomial interpolation as the default method for cve computation.
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

src/diffpy/labpdfproc/functions.py

@@ -38,16 +38,6 @@ def _get_grid_points(self):
         self.grid = {(x, y) for x in xs for y in ys if x**2 + y**2 <= self.radius**2}
         self.total_points_in_grid = len(self.grid)
 
-    # def get_coordinate_index(self, coordinate):  # I think we probably dont need this function?
-    #     count = 0
-    #     for i, target in enumerate(self.grid):
-    #         if coordinate == target:
-    #             return i
-    #         else:
-    #             count += 1
-    #     if count >= len(self.grid):
-    #         raise IndexError(f"WARNING: no coordinate {coordinate} found in coordinates list")
-
     def set_distances_at_angle(self, angle):
         """
         given an angle, set the distances from the grid points to the entry and exit coordinates

src/diffpy/labpdfproc/tools.py

@@ -110,13 +110,12 @@ def set_wavelength(args):
     args argparse.Namespace
         the arguments from the parser
 
+    we raise a ValueError if the input wavelength is non-positive
+    or if the input anode_type is not one of the known sources
+
     Returns
     -------
     args argparse.Namespace
-
-    we raise an ValueError if the input wavelength is non-positive
-    or if the input anode_type is not one of the known sources
-
     """
     if args.wavelength is not None and args.wavelength <= 0:
         raise ValueError(