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

Merge branch 'develop' into feature/metadata_class

Browse Source
This commit is contained in:
Marcel Paffrath 2018-07-10 11:49:48 +02:00
commit 47b045ad35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,9 +100,9 @@ def autopickevent(data, param, iplot=0, fig_dict=None, fig_dict_wadatijack=None,
# quality control # quality control
# median check and jackknife on P-onset times # median check and jackknife on P-onset times
jk_checked_onsets = checkPonsets(all_onsets, mdttolerance, jackfactor, 1, fig_dict_wadatijack) jk_checked_onsets = checkPonsets(all_onsets, mdttolerance, jackfactor, iplot, fig_dict_wadatijack)
# check S-P times (Wadati) # check S-P times (Wadati)
wadationsets = wadaticheck(jk_checked_onsets, wdttolerance, 1, fig_dict_wadatijack) wadationsets = wadaticheck(jk_checked_onsets, wdttolerance, iplot, fig_dict_wadatijack)
return wadationsets return wadationsets

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

@ -684,7 +684,7 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
wfitflag = 1 wfitflag = 1
# plot results # plot results
if iplot > 0: if iplot > 0 or fig_dict:
if fig_dict: if fig_dict:
fig = fig_dict['wadati'] fig = fig_dict['wadati']
linecolor = fig_dict['plot_style']['linecolor']['rgba_mpl'] linecolor = fig_dict['plot_style']['linecolor']['rgba_mpl']
@ -926,7 +926,7 @@ def checkPonsets(pickdic, dttolerance, jackfactor=5, iplot=0, fig_dict=None):
checkedonsets = pickdic checkedonsets = pickdic
if iplot > 0: if iplot > 0 or fig_dict:
if fig_dict: if fig_dict:
fig = fig_dict['jackknife'] fig = fig_dict['jackknife']
plt_flag = 0 plt_flag = 0