Fix masked TOF columns in reduction #173
Open
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
Previous error function was calculating the nonzero values in an incorrect manner. this is because I was modifying data_y array and then using it again with np.nonzero(). This was clearly a blunder on my part and was producing bad fits when some values are masked with zeros.
| @@ -532,9 +532,10 @@ def _error_function(self, pars): | |||
| data_e = self._dataE[self._row_being_fit] | |||
|
|
|||
| # Ignore any masked values on tof range | |||
| ncp_total = ncp_total[np.nonzero(data_y)] | |||
| data_y = data_y[np.nonzero(data_y)] | |||
| data_e = data_e[np.nonzero(data_y)] | |||
There was a problem hiding this comment.
My previous mistake was that I was doing np.nonzero(data_y) when I just modified data_y in the previous line.
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.
Description of work:
I noticed that when columns of zeros were present the fit of the spectra were failing.
Then after some time I spotted a mistake in the calculation with the error function.
Previous unit tests were not picking this up because I had written the error into them.
I edited the unit tests to now always expect the correct result.
To test:
Code review, check that all tests pass (the expected behaviour is now covered by the unit test)