Support an "ideal" RMF where MATRIX is a scalar (pyfits backend, fix #862) #863
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
|
A test case is needed, which is why this is still a WIP. EDITED TO ADD I've now added the test, do have removed the WIP |
DougBurke
changed the title
DougBurke
added
area:code
note: easy review
dtnguyen2
approved these changes
Aug 11, 2020
|
Gah. Another PR that needs rebasing. |
This is to support issue sherpa#862 where a MATRIX column is a scalar, not an array. This is aready supported by Crates, so the Astropy backend needs updating.
This test requires readnig a file in. Rather than adding another test file to the dataset this just creates the file local (in a temporary file) that gets deleted after the test runs. It makes it easier to create a "minimal" test case.
|
In rebasing this I found that two of the "extra" commits from this PR were no-longer needed (as another PR had converted test_io.py to pytest from SherpaTestCase) so I have dropped them. Which makes this more focussed: a commit to add the change, and one to add the test. |
Codecov Report
@@ Coverage Diff @@
## master #863 +/- ##
==========================================
- Coverage 62.98% 62.97% -0.02%
==========================================
Files 70 70
Lines 24315 24321 +6
Branches 3509 3510 +1
==========================================
Hits 15315 15315
- Misses 7862 7867 +5
- Partials 1138 1139 +1
Continue to review full report at Codecov.
|
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.
Summary
The AstroPy (pyfits) backend could not handle the case of an ideal RMF when the MATRIX column was specified as a scalar and not a 1-element array.
Details
This is to support issue #862 where a MATRIX column is a scalar, not an array. This is aready supported by Crates, so the Astropy backend needs updating. The change is small (if you can't access the first element of an array then treat it as a scalar), and is an extension to the changes in PRs #358 and #412 which dealt with Swift and ROSAT responses.
A test is added, but rather than adding a file to the Sherpa data corpus, we instead just create the file when needed. It also means that we can easily test the values read in as the data can be made to be easily tested (i.e. a small number of bins).