Merge branch 'export-and-save-picks' into develop

2015-07-18 16:13:37 +02:00
parent 1e58a86110 0b6fbd22c5
commit 0b02e8c213
3 changed files with 87 additions and 45 deletions
--- a/pylot/core/util/defaults.py
+++ b/pylot/core/util/defaults.py
@@ -13,6 +13,6 @@ FILTERDEFAULTS = {'P': {'filtertype': None,
                        'order': 4,
                        'freq': [.5, 5]}}

-OUTPUTFORMATS = {'QuakeML':'QUAKEML',
-                 'VelEst':'CNV',
-                 'NonLinLoc':'NLLOC_OBS'}
+OUTPUTFORMATS = {'.xml':'QUAKEML',
+                 '.cnv':'CNV',
+                 '.obs':'NLLOC_OBS'}