-
Notifications
You must be signed in to change notification settings - Fork 21
docs: add docstrings for on_d, on_q, on_tth, and dump #307
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
**Added:** | ||
|
||
* docstrings for `on_q`, `on_tth`, `on_d`, and `dump` in `diffraction_objects.py`. | ||
|
||
**Changed:** | ||
|
||
* <news item> | ||
|
||
**Deprecated:** | ||
|
||
* <news item> | ||
|
||
**Removed:** | ||
|
||
* <news item> | ||
|
||
**Fixed:** | ||
|
||
* <news item> | ||
|
||
**Security:** | ||
|
||
* <news item> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -418,12 +418,33 @@ def _get_original_array(self): | |
return self.on_d(), "d" | ||
|
||
def on_q(self): | ||
"""Return the tuple of two 1D numpy arrays containing q and y data. | ||
|
||
Returns | ||
------- | ||
(q-array, y-array) : tuple of ndarray | ||
The tuple containing two 1D numpy arrays with q and y data | ||
""" | ||
return [self.all_arrays[:, 1], self.all_arrays[:, 0]] | ||
|
||
def on_tth(self): | ||
"""Return the tuple of two 1D numpy arrays containing tth and y data. | ||
|
||
Returns | ||
------- | ||
(tth-array, y-array) : tuple of ndarray | ||
The tuple containing two 1D numpy arrays with tth and y data | ||
""" | ||
return [self.all_arrays[:, 2], self.all_arrays[:, 0]] | ||
|
||
def on_d(self): | ||
"""Return the tuple of two 1D numpy arrays containing d and y data. | ||
|
||
Returns | ||
------- | ||
(d-array, y-array) : tuple of ndarray | ||
The tuple containing two 1D numpy arrays with d and y data | ||
""" | ||
return [self.all_arrays[:, 3], self.all_arrays[:, 0]] | ||
|
||
def scale_to(self, target_diff_object, q=None, tth=None, d=None, offset=None): | ||
|
@@ -507,6 +528,34 @@ def on_xtype(self, xtype): | |
raise ValueError(_xtype_wmsg(xtype)) | ||
|
||
def dump(self, filepath, xtype=None): | ||
"""Dump the xarray and yarray of the diffraction object to a two-column | ||
file, with the associated information included in the header. | ||
|
||
Parameters | ||
---------- | ||
filepath : str | ||
The filepath where the diffraction object will be dumped | ||
xtype : str, optional, default is q | ||
The type of quantity for the independent variable chosen from {*XQUANTITIES, } | ||
|
||
Examples | ||
-------- | ||
To save a diffraction object to a file named "diffraction_data.chi" in the current directory | ||
with the independent variable 'q': | ||
|
||
>>> file = "diffraction_data.chi" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's also have another example, that shows a relative path. I think that should then be clear enough. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sounds great! I'll add that. |
||
>>> do.dump(file, xtype="q") | ||
|
||
To save the diffraction data to a file in a subfolder `output`: | ||
|
||
>>> file = "./output/diffraction_data.chi" | ||
>>> do.dump(file, xtype="q") | ||
|
||
To save the diffraction data with a different independent variable, such as 'tth': | ||
|
||
>>> file = "diffraction_data_tth.chi" | ||
>>> do.dump(file, xtype="tth") | ||
""" | ||
if xtype is None: | ||
xtype = "q" | ||
if xtype in QQUANTITIES: | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
non programmers may not know that that the path includes the filename. Best here is to give an example.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sbillinge added in the new commit. please review