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:
Marcel Paffrath 2017-08-16 10:04:23 +02:00
commit c6fa6d8ff8
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pylot/core/pick/autopick.py
View File

@ -1057,17 +1057,21 @@ def iteratepicker(wf, NLLocfile, picks, badpicks, pickparameter, fig_dict=None):
Precalcwin_old = pickparameter.get('Precalcwin') Precalcwin_old = pickparameter.get('Precalcwin')
noisefactor_old = pickparameter.get('noisefactor') noisefactor_old = pickparameter.get('noisefactor')
zfac_old = pickparameter.get('zfac') zfac_old = pickparameter.get('zfac')
pickparameter.setParam( twindows = pickparameter.get('tsnrz')
pstart=max([0, badpicks[i][1] - wf2pick[0].stats.starttime \ tsafety = twindows[1]
- pickparameter.get('tlta')])) pstart = max([0, badpicks[i][1] - wf2pick[0].stats.starttime - pickparameter.get('tlta')])
if abs(float(res)) <= tsafety / 2 or pstart == 0:
print("iteratepicker: Small residuum, leave parameters unchanged for this phase!")
else:
pickparameter.setParam(pstart=pstart)
pickparameter.setParam(pstop=pickparameter.get('pstart') + \ pickparameter.setParam(pstop=pickparameter.get('pstart') + \
(pickparameter.get('Precalcwin'))) (pickparameter.get('Precalcwin')))
pickparameter.setParam(sstop=pickparameter.get('sstop') / 2) pickparameter.setParam(sstop=pickparameter.get('sstop') / 2)
pickparameter.setParam(pickwinP=pickparameter.get('pickwinP') / 2) pickparameter.setParam(pickwinP=pickparameter.get('pickwinP') / 2)
pickparameter.setParam( pickparameter.setParam(Precalcwin=pickparameter.get('Precalcwin') / 2)
Precalcwin=pickparameter.get('Precalcwin') / 2)
pickparameter.setParam(noisefactor=1.0) pickparameter.setParam(noisefactor=1.0)
pickparameter.setParam(zfac=1.0) pickparameter.setParam(zfac=1.0)
print( print(
"iteratepicker: The following picking parameters have been modified for iterative picking:") "iteratepicker: The following picking parameters have been modified for iterative picking:")
print( print(

2
pylot/core/pick/utils.py
View File

@ -754,7 +754,7 @@ def checksignallength(X, pick, TSNR, minsiglength, nfac, minpercent, iplot=0, fi
# get signal window # get signal window
isignal = getsignalwin(t, pick, minsiglength) isignal = getsignalwin(t, pick, minsiglength)
# calculate minimum adjusted signal level # calculate minimum adjusted signal level
minsiglevel = max(rms[inoise]) * nfac minsiglevel = np.mean(rms[inoise]) * nfac
# minimum adjusted number of samples over minimum signal level # minimum adjusted number of samples over minimum signal level
minnum = len(isignal) * minpercent / 100 minnum = len(isignal) * minpercent / 100
# get number of samples above minimum adjusted signal level # get number of samples above minimum adjusted signal level