Correctly writing zero station magnitude contributions and reading/writing event regions in QuakeML #1625
Conversation
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
… into line with other Pickler methods, such as Pickler._arrival. This means that residual and weight are written even if they are both zero, and not written only when they are `None`. Also fixed a bug whereby Event.region was neither written to QuakeML nor read. Updated regression tests to reflect this, and added myself to contributors. Tidied up whitespace.
|
Forking from the maintenance branch seemed easier than resolving all the conflicts when rebasing from master to maintenance. Sorry for any confusion. |
megies
approved these changes
Dec 20, 2016
There was a problem hiding this comment.
Maybe a short item in the changelog, otherwise looks good to me, Travis fails are unrelated.
Thanks @nackerley!
megies
reviewed
Dec 20, 2016
obspy/io/quakeml/core.py
Outdated
| if contrib.residual: | ||
| etree.SubElement(contrib_el, 'residual').text = \ | ||
| str(contrib.residual) | ||
| self._str(contrib.station_magnitude_id.id, contrib_el, |
There was a problem hiding this comment.
@nackerley please get rid of the trailing whitespace..
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixed #1621 by bringing Pickler._station_magnitude_contributions() into line with other Pickler methods, such as Pickler._arrival(), in particular by making use of Pickler._str(). This means that residual and weight are written even if they are both zero, and not written only when they are
None.I suspect that Pickler._station_magnitude_contributions() was missed when other methods were updated a while back to use Pickler._str() mainly because it is out-of-order with the rest which do use Pickler._str(). A more natural place for it among the methods would be between Pickler._station_magnitude() and Pickler._origin(), but that would have made the diff less clear.
Also fixed a bug whereby Event.region was neither written to QuakeML nor read.
Updated regression tests to reflect these changes, and added myself to contributors, even this is a very minor contribution.