Skip to content
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

Plot Event far-field radiation pattern / refactor core/event.py into folder structure #1192

Merged
merged 61 commits into from
Feb 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2ebcc05
Close all figures on ImageComparison enter+exit by default
megies Feb 16, 2016
1715134
open figure for SOS filter image doctest
megies Feb 16, 2016
989a452
initial commit
Nov 24, 2015
744feef
some doc
Nov 24, 2015
77ad307
surface or quiver plots
Nov 24, 2015
9c39028
spherical mesh now aligned with moment tensor
Nov 25, 2015
b053745
small bugfix in trace.py
Nov 27, 2015
a849e23
new event folder, pep8 in radpattern
Dec 19, 2015
dfd2c1c
pep8 and test
Dec 19, 2015
0205a0c
add mayavi plotting option
Dec 19, 2015
e7c3068
paraview vtk file output
Dec 20, 2015
9fb10eb
more documentation
Dec 20, 2015
2076a06
some little changes
Dec 20, 2015
ef54424
some doc changes
Dec 20, 2015
4be34b6
little modifications
Dec 21, 2015
520a42f
vtk beachline modified
Dec 21, 2015
eca2a5c
pep8 corrections
Dec 21, 2015
2b3e97f
better matplotlib plot. Orientation checked
Dec 22, 2015
cfcf9b9
red/blue colors for beachball
Dec 22, 2015
78fe136
new mesh orientation for non-dc tensors
Dec 22, 2015
e3771bf
reduced ntheta, nphi and new title
Dec 22, 2015
a164cbc
p_sphere tension is inwards directed
Dec 22, 2015
5116cf5
new files for Ev and Cat. Event plot function
Dec 22, 2015
3395ff1
mini bug, new text
Dec 22, 2015
8684195
some little modifications
Dec 22, 2015
949eec9
future importes
Dec 22, 2015
da9d382
pep8
Dec 22, 2015
b253d71
new corrections
Dec 23, 2015
3eef5bf
import cleanup
Dec 23, 2015
c83624c
flake8 check
Dec 23, 2015
2c62dec
python3 syntax
Dec 23, 2015
645dc81
flake8
Dec 23, 2015
85638ce
doctest fix
Dec 23, 2015
f322fab
doctest fix
Dec 23, 2015
e3fc90e
reworked plots
MMesch Feb 3, 2016
ee2a551
complete refactoring, multiplot option
MMesch Feb 3, 2016
e5a0d93
flake8
MMesch Feb 3, 2016
6ed7c0b
mayavi plotting works
MMesch Feb 4, 2016
8bb24ac
little corrections
MMesch Feb 4, 2016
522cc45
flake 8, mayavi doc
MMesch Feb 4, 2016
0b3a62e
nodal lines in mayavi are closed. Better err msg
MMesch Feb 5, 2016
22f4a9e
proper citation/referencing
megies Feb 7, 2016
3b0a718
cleanup and pep8
megies Feb 7, 2016
c83923f
move read_events and related functions to catalog.py
megies Feb 7, 2016
e9cba54
3D quiver plot only supported by mpl>=1.4
megies Feb 7, 2016
554f10a
reduce code duplication
megies Feb 7, 2016
e496e3a
pep8, variables lower case
megies Feb 7, 2016
d80f3cb
radpattern: proper pluging into Event.plot() + image test
megies Feb 7, 2016
80292c9
refactor core/event substructure
megies Feb 7, 2016
6f24a9d
splitting up radpattern functions into core / imaging
megies Feb 7, 2016
db7f939
update CONTRIBUTORS + CHANGELOG
megies Feb 14, 2016
d8736e8
event plot: refactoring of subplot layouts
megies Feb 15, 2016
1d59cae
correct use of renamed `beach` function
megies Feb 15, 2016
65ac57c
enable Event plot with combined Map/Beachball/Radiation Pattern subplots
megies Feb 15, 2016
32574c2
only warn if neither basemap nor cartopy is installed
megies Feb 15, 2016
d3cacb4
update Event.plot() image test (now with map plots)
megies Feb 15, 2016
d368390
adjust event plot default
megies Feb 15, 2016
d75912b
minor adjustments to Event.plot()
megies Feb 15, 2016
0a04667
add Event example plots in docs and gallery
megies Feb 15, 2016
5316eb9
minor adjustments in Event plot (docstrings etc)
megies Feb 15, 2016
b6f5b55
skip event plot with maps and radiation pattern if no basemap
megies Feb 16, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ master:
* New method Stream/Trace.remove_sensitivity() to remove instrument
sensitivity
* Fix incorrect parsing of some non-ISO8601 date/time strings. (see #1215)
* Added plotting method to Event (customizable subplots from a selection
of map, beachball and farfield radiation plots, see #1192)
- obspy.clients.fdsn:
* Replace FDSN webservice shortcut `NERIES` with `EMSC` and deprecate the
`NERIES` shortcut, will be removed in a future release (see #1146).
Expand All @@ -56,6 +58,7 @@ master:
argument to functions that plot maps to select between Basemap or Cartopy.
* New default colormap for all plots. A backport of the new viridis colormap
from matplotlib is available for those using older matplotlib releases.
* Added plotting routines for farfield radiation patterns of moment tensors
- obspy.io.kml:
* New module for Google KML output of Inventory and Catalog objects
(e.g. for use in Google Earth)
Expand Down
5 changes: 5 additions & 0 deletions misc/docs/source/bibliography/Aki1980.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@book{Aki1980,
title={Quantitative Seismology},
author={Aki, Keiiti and Richards, Paul G},
year={1980},
}
18 changes: 17 additions & 1 deletion misc/docs/source/gallery.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Gallery
net.plot(projection="ortho")

.. gallery-plot::
:target: packages/autogen/obspy.core.event.Catalog.plot.html
:target: packages/autogen/obspy.core.event.catalog.Catalog.plot.html
:alt: Basemap preview plot of Catalog class

from obspy import read_events
Expand Down Expand Up @@ -223,6 +223,22 @@ Gallery

polynomial(tr.data, order=3, plot=True)

.. gallery-plot::
:target: packages/autogen/obspy.core.event.event.Event.plot.html
:alt: Event plot

from obspy import read_events
cat = read_events("/path/to/CMTSOLUTION")
cat.plot()

.. gallery-plot::
:target: packages/autogen/obspy.core.event.event.Event.plot.html
:alt: Event plot

from obspy import read_events
cat = read_events("/path/to/CMTSOLUTION")
cat.plot(kind=[['global'], ['p_sphere', 'p_quiver']])

.. image:: /_static/sds_report.png
:target: packages/autogen/obspy.scripts.sds_html_report.html
:alt: SDS html report
Expand Down
37 changes: 37 additions & 0 deletions misc/docs/source/packages/obspy.core.event.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.. currentmodule:: obspy.core.inventory
.. automodule:: obspy.core.inventory

.. comment to end block

Classes & Functions
-------------------
.. autosummary::
:toctree: autogen
:nosignatures:

catalog.Catalog
event.Event
origin.Origin
magnitude.Magnitude
origin.Pick
magnitude.Amplitude
source.FocalMechanism
source.MomentTensor

.. comment to end block

Modules
-------
.. autosummary::
:toctree: autogen
:nosignatures:

base
catalog
event
header
magnitude
origin
source

.. comment to end block
1 change: 1 addition & 0 deletions misc/docs/source/packages/obspy.imaging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
waveform
mopad_wrapper
maps
source

.. comment to end block

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ a dictionary as ``'attrib'``.
If desired for better (human-)readability, namespace abbreviations in the
output xml can be specified during output as QuakeML by providing a dictionary
of namespace abbreviation mappings as `nsmap` parameter to
:meth:`Catalog.write() <obspy.core.event.Catalog.write>`.
:meth:`Catalog.write() <obspy.core.event.catalog.Catalog.write>`.
The xml output of the above example looks like:

.. code-block:: xml
Expand Down
1 change: 1 addition & 0 deletions obspy/CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Jonathan MacCarthy
Alessia Maggi
Henri Martin
Tobias Megies
Matthias Meschede
Alberto Michelini
Bernhard Morgenstern
Nathaniel C. Miller
Expand Down