Skip to content

Commit 891d774

Browse files
authored
Merge pull request #233 from bobleesj/rm-range-methods
Remove `set_angles_from_list`, `set_angles_from`, `set_qs_from_range`
2 parents 3918433 + 3a3fcec commit 891d774

File tree

2 files changed

+23
-67
lines changed

2 files changed

+23
-67
lines changed

Diff for: news/rm-range-methods.rst

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* `set_angles_from_list`, `set_angles_from`, `set_qs_from_range` methods in `DiffractionObject`
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

Diff for: src/diffpy/utils/diffraction_objects.py

-67
Original file line numberDiff line numberDiff line change
@@ -215,73 +215,6 @@ def id(self):
215215
def id(self, _):
216216
raise AttributeError(_setter_wmsg("id"))
217217

218-
def set_angles_from_list(self, angles_list):
219-
self.angles = angles_list
220-
self.n_steps = len(angles_list) - 1.0
221-
self.begin_angle = self.angles[0]
222-
self.end_angle = self.angles[-1]
223-
224-
def set_qs_from_range(self, begin_q, end_q, step_size=None, n_steps=None):
225-
"""
226-
create an array of linear spaced Q-values
227-
228-
Parameters
229-
----------
230-
begin_q float
231-
the beginning angle
232-
end_q float
233-
the ending angle
234-
step_size float
235-
the size of the step between points. Only specify step_size or n_steps, not both
236-
n_steps integer
237-
the number of steps. Odd numbers are preferred. Only specify step_size or n_steps, not both
238-
239-
Returns
240-
-------
241-
Sets self.qs
242-
self.qs array of floats
243-
the q values in the independent array
244-
245-
"""
246-
self.qs = self._set_array_from_range(begin_q, end_q, step_size=step_size, n_steps=n_steps)
247-
248-
def set_angles_from_range(self, begin_angle, end_angle, step_size=None, n_steps=None):
249-
"""
250-
create an array of linear spaced angle-values
251-
252-
Parameters
253-
----------
254-
begin_angle float
255-
the beginning angle
256-
end_angle float
257-
the ending angle
258-
step_size float
259-
the size of the step between points. Only specify step_size or n_steps, not both
260-
n_steps integer
261-
the number of steps. Odd numbers are preferred. Only specify step_size or n_steps, not both
262-
263-
Returns
264-
-------
265-
Sets self.angles
266-
self.angles array of floats
267-
the q values in the independent array
268-
269-
"""
270-
self.angles = self._set_array_from_range(begin_angle, end_angle, step_size=step_size, n_steps=n_steps)
271-
272-
def _set_array_from_range(self, begin, end, step_size=None, n_steps=None):
273-
if step_size is not None and n_steps is not None:
274-
print(
275-
"WARNING: both step_size and n_steps have been given. n_steps will be used and step_size will be "
276-
"reset."
277-
)
278-
array = np.linspace(begin, end, n_steps)
279-
elif step_size is not None:
280-
array = np.arange(begin, end, step_size)
281-
elif n_steps is not None:
282-
array = np.linspace(begin, end, n_steps)
283-
return array
284-
285218
def get_array_index(self, value, xtype=None):
286219
"""
287220
Return the index of the closest value in the array associated with the specified xtype.

0 commit comments

Comments
 (0)