From 3a3fcecd2ca0fffaf4862e42ab73f238be9f17dd Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Sat, 14 Dec 2024 15:04:27 -0500 Subject: [PATCH] Remove set_angles_from_list, set_angles_from, set_qs_from_range and add news --- news/rm-range-methods.rst | 23 +++++++++ src/diffpy/utils/diffraction_objects.py | 67 ------------------------- 2 files changed, 23 insertions(+), 67 deletions(-) create mode 100644 news/rm-range-methods.rst diff --git a/news/rm-range-methods.rst b/news/rm-range-methods.rst new file mode 100644 index 00000000..8150da16 --- /dev/null +++ b/news/rm-range-methods.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* `set_angles_from_list`, `set_angles_from`, `set_qs_from_range` methods in `DiffractionObject` + +**Fixed:** + +* + +**Security:** + +* diff --git a/src/diffpy/utils/diffraction_objects.py b/src/diffpy/utils/diffraction_objects.py index b5179874..a242c895 100644 --- a/src/diffpy/utils/diffraction_objects.py +++ b/src/diffpy/utils/diffraction_objects.py @@ -215,73 +215,6 @@ def id(self): def id(self, _): raise AttributeError(_setter_wmsg("id")) - def set_angles_from_list(self, angles_list): - self.angles = angles_list - self.n_steps = len(angles_list) - 1.0 - self.begin_angle = self.angles[0] - self.end_angle = self.angles[-1] - - def set_qs_from_range(self, begin_q, end_q, step_size=None, n_steps=None): - """ - create an array of linear spaced Q-values - - Parameters - ---------- - begin_q float - the beginning angle - end_q float - the ending angle - step_size float - the size of the step between points. Only specify step_size or n_steps, not both - n_steps integer - the number of steps. Odd numbers are preferred. Only specify step_size or n_steps, not both - - Returns - ------- - Sets self.qs - self.qs array of floats - the q values in the independent array - - """ - self.qs = self._set_array_from_range(begin_q, end_q, step_size=step_size, n_steps=n_steps) - - def set_angles_from_range(self, begin_angle, end_angle, step_size=None, n_steps=None): - """ - create an array of linear spaced angle-values - - Parameters - ---------- - begin_angle float - the beginning angle - end_angle float - the ending angle - step_size float - the size of the step between points. Only specify step_size or n_steps, not both - n_steps integer - the number of steps. Odd numbers are preferred. Only specify step_size or n_steps, not both - - Returns - ------- - Sets self.angles - self.angles array of floats - the q values in the independent array - - """ - self.angles = self._set_array_from_range(begin_angle, end_angle, step_size=step_size, n_steps=n_steps) - - def _set_array_from_range(self, begin, end, step_size=None, n_steps=None): - if step_size is not None and n_steps is not None: - print( - "WARNING: both step_size and n_steps have been given. n_steps will be used and step_size will be " - "reset." - ) - array = np.linspace(begin, end, n_steps) - elif step_size is not None: - array = np.arange(begin, end, step_size) - elif n_steps is not None: - array = np.linspace(begin, end, n_steps) - return array - def get_array_index(self, value, xtype=None): """ Return the index of the closest value in the array associated with the specified xtype.