From 51be558560dd0543f8e54e9b9934a4233f92469a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 21 Jun 2017 13:01:14 +0200 Subject: [PATCH 1/2] New parameters added for local magnitude estimation and scaling. --- pylot/core/io/default_parameters.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pylot/core/io/default_parameters.py b/pylot/core/io/default_parameters.py index 1ae7caad..68c09a46 100644 --- a/pylot/core/io/default_parameters.py +++ b/pylot/core/io/default_parameters.py @@ -277,9 +277,13 @@ defaults = {'rootpath': {'type': str, 'tooltip': 'maximum allowed deviation from Wadati-diagram', 'value': 1.0}, - 'localMag': {'type': float, - 'tooltip': 'maximum allowed deviation from Wadati-diagram', - 'value': 1.0} + 'WAscaling': {'type': float, + 'tooltip': 'Scaling relation of Wood-Anderson amplitude [nm]', + 'value': []}, + + 'magscaling': {'type': (float), + 'tooltip': 'Scaling relation for derived local magnitude', + 'value': []} } settings_main={ @@ -301,8 +305,10 @@ settings_main={ 'smoment':[ 'vp', 'rho', - 'Qp', - 'localMag'], + 'Qp'], + 'localmag':[ + 'WAscaling', + 'magscaling'], 'pick':[ 'extent', 'pstart', From 9dc1545b6314415dd1c4a0c3c8be47ee57d8ce15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 21 Jun 2017 13:03:17 +0200 Subject: [PATCH 2/2] Renamed/added new main parameter sequence Seismic Moment and Local Magnitude. --- pylot/core/util/widgets.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index a92a7940..96bd03ed 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -2119,6 +2119,8 @@ class AutoPickParaBox(QtGui.QWidget): self.parameter.get_main_para_names()['nlloc']) self.add_to_layout(self._main_layout, 'Seismic Moment', self.parameter.get_main_para_names()['smoment']) + self.add_to_layout(self._main_layout, 'Local Magnitude', + self.parameter.get_main_para_names()['localmag']) self.add_to_layout(self._main_layout, 'Common Settings Characteristic Function', self.parameter.get_main_para_names()['pick']) self.add_tab(self._main_layout, 'Main Settings')