Skip to content

test function on_xtype #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 7, 2024
Merged

test function on_xtype #192

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5a32de4
initial commit, raise value error if xtype is invalid
yucongalicechen Dec 2, 2024
19efee8
merge main into this branch
yucongalicechen Dec 3, 2024
bf52078
change test intensity array to avoid duplication with x-arrays
yucongalicechen Dec 3, 2024
1344a7d
merge updates from main
yucongalicechen Dec 4, 2024
1f9f142
edit tests
yucongalicechen Dec 4, 2024
11a15ee
add docstring and news
yucongalicechen Dec 5, 2024
57465e2
edit tests
yucongalicechen Dec 5, 2024
2e1853a
edit docstring
yucongalicechen Dec 6, 2024
7eb0c0d
remove warning in error msg
yucongalicechen Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
edit docstring
  • Loading branch information
@yucongalicechen
yucongalicechen committed Dec 6, 2024
commit 2e1853af96d0dd2b13d5bd3e89df12afade2fd0f
4 changes: 2 additions & 2 deletions src/diffpy/utils/diffraction_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def scale_to(self, target_diff_object, xtype=None, xvalue=None):

def on_xtype(self, xtype):
f"""
return a 2D np array with x in the first column and y in the second for x of type type
return a list of two 1D np array with x and y data, raise an error if the specified xtype is invalid

Parameters
----------
Expand All @@ -386,7 +386,7 @@ def on_xtype(self, xtype):

Returns
-------
a 2D np array with x and y data
a list of two 1D np array with x and y data
"""
if xtype.lower() in ANGLEQUANTITIES:
return self.on_tth()
Expand Down
Loading