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

Removed hard coded parameters for earllatepicker, takes paramters now from pylot.in-file.

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-03-29 09:58:30 +02:00
parent fa7a0e9c10
commit b233d80cb4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -818,9 +818,9 @@ class PickDlg(QDialog):
self.cidpress = self.connectPressEvent(self.setPick) self.cidpress = self.connectPressEvent(self.setPick)
if self.selectPhase.currentText().upper().startswith('P'): if self.selectPhase.currentText().upper().startswith('P'):
self.setIniPickP(self.getinfile(), gui_event, wfdata, trace_number) self.setIniPickP(gui_event, wfdata, trace_number)
elif self.selectPhase.currentText().upper().startswith('S'): elif self.selectPhase.currentText().upper().startswith('S'):
self.setIniPickS(self.getinfile(), gui_event, wfdata) self.setIniPickS(gui_event, wfdata)
self.zoomAction.setEnabled(False) self.zoomAction.setEnabled(False)
@ -828,9 +828,9 @@ class PickDlg(QDialog):
self.setPlotLabels() self.setPlotLabels()
self.draw() self.draw()
def setIniPickP(self, infile, gui_event, wfdata, trace_number): def setIniPickP(self, gui_event, wfdata, trace_number):
parameter = AutoPickParameter(infile) parameter = AutoPickParameter(self.getinfile())
ini_pick = gui_event.xdata ini_pick = gui_event.xdata
nfac = parameter.get('nfacP') nfac = parameter.get('nfacP')
@ -877,9 +877,9 @@ class PickDlg(QDialog):
noiselevel=(trace_number + noiselevel, noiselevel=(trace_number + noiselevel,
trace_number - noiselevel)) trace_number - noiselevel))
def setIniPickS(self, infile, gui_event, wfdata): def setIniPickS(self, gui_event, wfdata):
parameter = AutoPickParameter(infile) parameter = AutoPickParameter(self.getinfile())
ini_pick = gui_event.xdata ini_pick = gui_event.xdata
nfac = parameter.get('nfacS') nfac = parameter.get('nfacS')
@ -933,6 +933,8 @@ class PickDlg(QDialog):
def setPick(self, gui_event): def setPick(self, gui_event):
parameter = AutoPickParameter(self.getinfile())
# get axes limits # get axes limits
self.updateCurrentLimits() self.updateCurrentLimits()
@ -952,7 +954,14 @@ class PickDlg(QDialog):
wfdata.filter(**filteroptions) wfdata.filter(**filteroptions)
# get earliest and latest possible pick and symmetric pick error # get earliest and latest possible pick and symmetric pick error
[epp, lpp, spe] = earllatepicker(wfdata, 1.5, (5., .5, 2.), pick) if wfdata[0].stats.channel[2] == 'Z' or wfdata[0].stats.channel[2] == '3':
nfac = parameter.get('nfacP')
TSNR = parameter.get('tsnrz')
else:
nfac = parameter.get('nfacS')
TSNR = parameter.get('tsnrh')
[epp, lpp, spe] = earllatepicker(wfdata, nfac, (TSNR[0], TSNR[1], TSNR[2]), pick)
# return absolute time values for phases # return absolute time values for phases
stime = self.getStartTime() stime = self.getStartTime()