Fixed some minor bugs.

This commit is contained in:
Ludger Küperkoch 2017-03-28 09:46:40 +02:00
parent b235733d2b
commit af7b0e1887

View File

@ -41,7 +41,6 @@ def autopickevent(data, param):
for station in stations: for station in stations:
topick = data.select(station=station) topick = data.select(station=station)
all_onsets[station] = autopickstation(topick, param, verbose=apverbose) all_onsets[station] = autopickstation(topick, param, verbose=apverbose)
all_onsets[station]['network'] = topick[0].stats.network
# quality control # quality control
# median check and jackknife on P-onset times # median check and jackknife on P-onset times
@ -780,12 +779,14 @@ def autopickstation(wfstream, pickparam, verbose=False):
# create dictionary # create dictionary
# for P phase # for P phase
ccode = zdat[0].stats.channel ccode = zdat[0].stats.channel
ppick = dict(channel=ccode, lpp=lpickP, epp=epickP, mpp=mpickP, spe=Perror, snr=SNRP, ncode = zdat[0].stats.network
ppick = dict(channel=ccode, network=ncode, lpp=lpickP, epp=epickP, mpp=mpickP, spe=Perror, snr=SNRP,
snrdb=SNRPdB, weight=Pweight, fm=FM, w0=None, fc=None, Mo=None, snrdb=SNRPdB, weight=Pweight, fm=FM, w0=None, fc=None, Mo=None,
Mw=None, picker=picker, marked=Pmarker) Mw=None, picker=picker, marked=Pmarker)
# add S phase # add S phase
ccode = edat[0].stats.channel ccode = edat[0].stats.channel
spick = dict(channel=ccode, lpp=lpickS, epp=epickS, mpp=mpickS, spe=Serror, snr=SNRS, ncode = edat[0].stats.network
spick = dict(channel=ccode, network=ncode, lpp=lpickS, epp=epickS, mpp=mpickS, spe=Serror, snr=SNRS,
snrdb=SNRSdB, weight=Sweight, fm=None, picker=picker, Ao=Ao) snrdb=SNRSdB, weight=Sweight, fm=None, picker=picker, Ao=Ao)
# merge picks into returning dictionary # merge picks into returning dictionary
picks = dict(P=ppick, S=spick) picks = dict(P=ppick, S=spick)
@ -871,7 +872,6 @@ def iteratepicker(wf, NLLocfile, picks, badpicks, pickparameter):
# replace old dictionary with new one # replace old dictionary with new one
picks[badpicks[i][0]] = newpicks picks[badpicks[i][0]] = newpicks
picks[badpicks[i][0]]['network'] = wf2pick[0].stats.network
# reset temporary change of picking parameters # reset temporary change of picking parameters
print("iteratepicker: Resetting picking parameters ...") print("iteratepicker: Resetting picking parameters ...")