diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 6bf29797..d2392439 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -f91e1-dirty +97ee-dirty diff --git a/pylot/core/io/default_parameters.py b/pylot/core/io/default_parameters.py index 93d55ae4..c936436b 100644 --- a/pylot/core/io/default_parameters.py +++ b/pylot/core/io/default_parameters.py @@ -282,8 +282,24 @@ defaults = {'rootpath': {'type': str, 'value': (1.0, 1.0, 1.0)}, 'magscaling': {'type': (float, float), - 'tooltip': 'Scaling relation for derived local magnitude [a*Ml+b]', - 'value': (1.0, 1.0)} + 'tooltip': 'Scaling relation for derived local magnitude [a*Ml+b]', + 'value': (1.0, 1.0)}, + + 'minfreq': {'type': float, + 'tooltip': 'Lower filter frequency', + 'value': 1.0}, + + 'maxfreq': {'type': float, + 'tooltip': 'Upper filter frequency', + 'value': 10.0}, + + 'filter_order': {'type': int, + 'tooltip': 'filter order', + 'value': 2}, + + 'filter_type': {'type': str, + 'tooltip': 'filter type (bandpass, bandstop, lowpass, highpass)', + 'value': None} } settings_main={ @@ -309,6 +325,11 @@ settings_main={ 'localmag':[ 'WAscaling', 'magscaling'], + 'filter':[ + 'minfreq', + 'maxfreq', + 'filter_order', + 'filter_type'], 'pick':[ 'extent', 'pstart', diff --git a/pylot/core/io/inputs.py b/pylot/core/io/inputs.py index 3653b828..26e2e233 100644 --- a/pylot/core/io/inputs.py +++ b/pylot/core/io/inputs.py @@ -141,7 +141,8 @@ class PylotParameter(object): all_names += self.get_main_para_names()['nlloc'] all_names += self.get_main_para_names()['smoment'] all_names += self.get_main_para_names()['localmag'] - all_names += self.get_main_para_names()['pick'] + all_names += self.get_main_para_names()['pick'] + all_names += self.get_main_para_names()['filter'] all_names += self.get_special_para_names()['z'] all_names += self.get_special_para_names()['h'] all_names += self.get_special_para_names()['fm'] @@ -237,6 +238,8 @@ class PylotParameter(object): 'parameters for seismic moment estimation', seperator) self.write_section(fid_out, self.get_main_para_names()['localmag'], 'settings local magnitude', seperator) + self.write_section(fid_out, self.get_main_para_names()['filter'], + 'filter settings', seperator) self.write_section(fid_out, self.get_main_para_names()['pick'], 'common settings picker', seperator) fid_out.write(('#special settings for calculating CF#\n'+ diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index 29cabb60..7765b2b3 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -2135,8 +2135,10 @@ class PylotParaBox(QtGui.QWidget): self.parameter.get_main_para_names()['smoment'], 2) self.add_to_layout(self._main_layout, 'Local Magnitude', self.parameter.get_main_para_names()['localmag'], 3) + self.add_to_layout(self._main_layout, 'Filter Settings', + self.parameter.get_main_para_names()['filter'], 4) self.add_to_layout(self._main_layout, 'Common Settings Characteristic Function', - self.parameter.get_main_para_names()['pick'], 4) + self.parameter.get_main_para_names()['pick'], 5) self.add_tab(self._main_layout, 'Main Settings') def add_special_pick_parameters_tab(self):