marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-03-08 20:36:12 +01:00
commit c651b5ca78
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pylot/core/util/widgets.py
View File

@ -521,10 +521,10 @@ class PickDlg(QDialog):
settings = QSettings() settings = QSettings()
nfac = settings.value('picking/nfac_P', 1.5) nfac = settings.value('picking/nfac_S', 1.5)
noise_win = settings.value('picking/noise_win_P', 5.) noise_win = settings.value('picking/noise_win_S', 5.)
gap_win = settings.value('picking/gap_win_P', .2) gap_win = settings.value('picking/gap_win_S', .2)
signal_win = settings.value('picking/signal_win_P', 3.) signal_win = settings.value('picking/signal_win_S', 3.)
# copy data for plotting # copy data for plotting
data = self.getWFData().copy() data = self.getWFData().copy()
@ -583,15 +583,21 @@ class PickDlg(QDialog):
pick = gui_event.xdata # get pick time relative to the traces timeaxis not to the global pick = gui_event.xdata # get pick time relative to the traces timeaxis not to the global
channel = self.getChannelID(round(gui_event.ydata)) channel = self.getChannelID(round(gui_event.ydata))
wfdata = self.getWFData().copy().select(channel=channel)
stime = self.getStartTime()
# get earliest and latest possible pick and symmetric pick error
[epp, lpp, spe] = earllatepicker(wfdata, 1.5, (5., .5, 2.), pick)
# get name of phase actually picked # get name of phase actually picked
phase = self.selectPhase.currentText() phase = self.selectPhase.currentText()
# get filter parameter for the phase to be picked
filteroptions = self.getFilterOptions(phase).parseFilterOptions()
# copy and filter data for earliest and latest possible picks
wfdata = self.getWFData().copy().select(channel=channel)
wfdata.filter(**filteroptions)
# get earliest and latest possible pick and symmetric pick error
[epp, lpp, spe] = earllatepicker(wfdata, 1.5, (5., .5, 2.), pick)
# return absolute time values for phases # return absolute time values for phases
stime = self.getStartTime()
epp = stime + epp epp = stime + epp
mpp = stime + pick mpp = stime + pick
lpp = stime + lpp lpp = stime + lpp