[edit] introducing picker tag

New tag introduced to distinguish between pickers (either person's or programs name)
This commit is contained in:
Sebastian Wehling-Benatelli 2016-03-23 11:48:58 +01:00
parent 438b2706b7
commit 31d56cb287
2 changed files with 10 additions and 14 deletions

View File

@ -144,6 +144,7 @@ def autopickstation(wfstream, pickparam, verbose=False):
Sflag = 0 Sflag = 0
Pmarker = [] Pmarker = []
Ao = None # Wood-Anderson peak-to-peak amplitude Ao = None # Wood-Anderson peak-to-peak amplitude
picker = 'autoPyLoT' # name of the picking programm
# split components # split components
zdat = wfstream.select(component="Z") zdat = wfstream.select(component="Z")
@ -796,21 +797,14 @@ def autopickstation(wfstream, pickparam, verbose=False):
# create dictionary # create dictionary
# for P phase # for P phase
phase = 'P' ppick = dict(lpp=lpickP, epp=epickP, mpp=mpickP, spe=Perror, snr=SNRP,
phasepick = {'lpp': lpickP, 'epp': epickP, 'mpp': mpickP, 'spe': Perror, snrdb=SNRPdB, weight=Pweight, fm=FM, w0=None, fc=None, Mo=None,
'snr': SNRP, 'snrdb': SNRPdB, 'weight': Pweight, 'fm': FM, Mw=None, picker=picker, marked=Pmarker)
'w0': None, 'fc': None, 'Mo': None, 'Mw': None}
picks = {phase: phasepick}
# add P marker
picks[phase]['marked'] = Pmarker
# add S phase # add S phase
phase = 'S' spick = dict(lpp=lpickS, epp=epickS, mpp=mpickS, spe=Serror, snr=SNRS,
phasepick = {'lpp': lpickS, 'epp': epickS, 'mpp': mpickS, 'spe': Serror, snrdb=SNRSdB, weight=Sweight, fm=None, picker=picker, Ao=Ao)
'snr': SNRS, 'snrdb': SNRSdB, 'weight': Sweight, 'fm': None} # merge picks into returning dictionary
picks[phase] = phasepick picks = dict(P=ppick, S=spick)
# add Wood-Anderson amplitude
picks[phase]['Ao'] = Ao
return picks return picks

View File

@ -421,12 +421,14 @@ class Data(object):
epp = phase['epp'] epp = phase['epp']
lpp = phase['lpp'] lpp = phase['lpp']
error = phase['spe'] error = phase['spe']
picker = phase['picker']
pick = Pick() pick = Pick()
pick.time = onset pick.time = onset
pick.time_errors.lower_uncertainty = onset - epp pick.time_errors.lower_uncertainty = onset - epp
pick.time_errors.upper_uncertainty = lpp - onset pick.time_errors.upper_uncertainty = lpp - onset
pick.time_errors.uncertainty = error pick.time_errors.uncertainty = error
pick.phase_hint = label pick.phase_hint = label
pick.method_id = ResourceIdentifier(id=picker)
pick.waveform_id = WaveformStreamID(station_code=station) pick.waveform_id = WaveformStreamID(station_code=station)
self.getEvtData().picks.append(pick) self.getEvtData().picks.append(pick)
try: try: