Checks for NDData and data/subshape dimension length agreement in subtract_psf #833
Conversation
This file contains 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
… checks to see if data is the same size as subshape in both dimensions and not call extract_array/sub_array accordingly
astrofrog
requested changes
Aug 1, 2019
| @@ -207,10 +208,13 @@ def subtract_psf(data, psf, posflux, subshape=None): | |||
|
|
|||
| Returns | |||
| ------- | |||
| subdata : same shape and type as ``data`` | |||
| subbeddata : same shape and type as ``data`` | |||
There was a problem hiding this comment.
what about subbed_data or subtracted_data?
| if subshape is None: | ||
| # data shape being exactly the same as subshape in both dimensions is equivalent to subtracting | ||
| # from the entire image, with no need to call extract_array and add_array | ||
| if subshape is None or all(data.shape[ind] == subshape[ind] for ind in [0, 1]): | ||
| indicies_reversed = indices[::-1] |
There was a problem hiding this comment.
Can we fix indicies -> indices?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes a few minor check/edge cases in
subtract_psf.The docstrings say that
datacan be anastropy.nddata.NDDataobject, but the first line previously checked fordata.ndimwhich would throw anAttributeErrorfor anNDDataobject.Currently the only check on whether the PSF can be subtracted directly from the image or if a cutout is required is
if subshape is None, but equally true would be the case wheredataandsubshapeare equal in both dimensions, which bypasses unnecessary code inextract_arrayandadd_array.Closes #818 (at least the case where both dimension lengths are equal; for the final edge case of one equal one non-equal dimension length
add_arraywould need amending)