[bugfix] mainly added missing taup model (lost in branch merging for python3), some smaller fixes for S picking

This commit is contained in:
Marcel Paffrath 2022-05-31 12:45:22 +02:00
parent 084fb10cea
commit cd9c139349
4 changed files with 10 additions and 6 deletions

View File

@ -2548,6 +2548,7 @@ class MainWindow(QMainWindow):
picks=self.getPicksOnStation(station, 'manual'),
autopicks=self.getPicksOnStation(station, 'auto'),
metadata=self.metadata, event=event,
model=self.inputs.get('taup_model'),
filteroptions=self.filteroptions, wftype=wftype)
if self.filterActionP.isChecked():
pickDlg.currentPhase = "P"
@ -2661,7 +2662,7 @@ class MainWindow(QMainWindow):
self.init_fig_dict()
# if not self.tap:
# init TuneAutopicker object
self.tap = TuneAutopicker(self)
self.tap = TuneAutopicker(self, self.obspy_dmt)
# first call of update to init tabs with empty canvas
self.update_autopicker()
# connect update signal of TuneAutopicker with update function

View File

@ -661,13 +661,14 @@ class AutopickStation(object):
ax2.plot([self.s_results.lpp, self.s_results.lpp], [-1.1, 1.1], 'g--', label='lpp')
ax2.plot([self.s_results.epp, self.s_results.epp], [-1.1, 1.1], 'g--', label='epp')
title = '{channel}, S weight={sweight}, SNR={snr:7.2}, SNR[dB]={snrdb:7.2}'
ax2.set_title(title.format(channel=self.etrace.stats.channel,
sweight=self.s_results.weight,
snr=self.s_results.snr,
snrdb=self.s_results.snrdb))
ax2.set_title(title.format(channel=str(self.etrace.stats.channel),
sweight=str(self.s_results.weight),
snr=str(self.s_results.snr),
snrdb=str(self.s_results.snrdb)))
else:
title = '{channel}, S weight={sweight}, SNR=None, SNR[dB]=None'
ax2.set_title(title.format(channel=self.etrace.stats.channel, sweight=self.s_results.weight))
ax2.set_title(title.format(channel=str(self.etrace.stats.channel),
sweight=str(self.s_results.weight)))
ax2.legend(loc=1)
ax2.set_yticks([])
ax2.set_ylim([-1.5, 1.5])

View File

@ -478,6 +478,7 @@ class Array_map(QtWidgets.QWidget):
picks=self._parent.get_current_event().getPick(station),
autopicks=self._parent.get_current_event().getAutopick(station),
filteroptions=self._parent.filteroptions, metadata=self.metadata,
model=self.parameter.get('taup_model'),
event=pyl_mw.get_current_event())
except Exception as e:
message = 'Could not generate Plot for station {st}.\n {er}'.format(st=station, er=e)

View File

@ -3675,6 +3675,7 @@ class TuneAutopicker(QWidget):
picks=self.get_current_event_picks(station),
autopicks=self.get_current_event_autopicks(station),
metadata=metadata, event=event, filteroptions=filteroptions,
model=self.parameter.get('taup_model'),
embedded=True, wftype=wftype)
self.pickDlg.update_picks.connect(self.picks_from_pickdlg)
self.pickDlg.update_picks.connect(self.fill_eventbox)