first working version of threaded tuneAutopicker

This commit is contained in:
2017-05-12 13:58:05 +02:00
parent 184983bc87
commit 12e6106227
4 changed files with 21 additions and 29 deletions

View File

@@ -341,7 +341,7 @@ def autopickstation(wfstream, pickparam, verbose=False, iplot=0, fig_dict=None):
if iplot:
key = 'el_Ppick'
epickP, lpickP, Perror = earllatepicker(z_copy, nfacP, tsnrz,
mpickP, iplot, fig_dict[key])
mpickP, iplot, fig=fig_dict[key])
else:
epickP, lpickP, Perror = earllatepicker(z_copy, nfacP, tsnrz,
mpickP, iplot)
@@ -470,7 +470,7 @@ def autopickstation(wfstream, pickparam, verbose=False, iplot=0, fig_dict=None):
# of class AutoPicking
key = 'aicARHfig'
aicarhpick = AICPicker(haiccf, tsnrh, pickwinS, iplot, None,
aictsmoothS, fig_dict[key])
aictsmoothS, fig = fig_dict[key])
###############################################################
# go on with processing if AIC onset passes quality control
if (aicarhpick.getSlope() >= minAICSslope and

View File

@@ -105,6 +105,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None, stealth_mode=False, fig=Non
if iplot > 1:
if not fig:
print('New Figure.........................')
fig = plt.figure()#iplot)
ax = fig.add_subplot(111)
ax.plot(t, x, 'k', label='Data')
@@ -128,10 +129,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None, stealth_mode=False, fig=Non
X[0].stats.station)
ax.legend()
if iplot:
return EPick, LPick, PickError
else:
return EPick, LPick, PickError
return EPick, LPick, PickError
def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None, fig=None):
@@ -307,10 +305,7 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None, fig=None):
ax2.set_xlabel('Time [s] since %s' % Xraw[0].stats.starttime)
ax2.set_yticks([])
if iplot:
return FM
else:
return FM
return FM
def crossings_nonzero_all(data):