methodID also taken into account for automatic picks.

This commit is contained in:
Ludger Küperkoch 2017-04-28 11:47:56 +02:00
parent 1b3fc717a6
commit 62254e8af0
2 changed files with 4 additions and 3 deletions

View File

@ -1 +1 @@
d4de-dirty 1b3fc-dirty

View File

@ -835,8 +835,9 @@ def merge_picks(event, picks):
err = pick.time_errors err = pick.time_errors
phase = pick.phase_hint phase = pick.phase_hint
station = pick.waveform_id.station_code station = pick.waveform_id.station_code
method = pick.method_id
for p in event.picks: for p in event.picks:
if p.waveform_id.station_code == station and p.phase_hint == phase: if p.waveform_id.station_code == station and p.phase_hint == phase:
p.time, p.time_errors = time, err p.time, p.time_errors, p.method_id = time, err, method
del time, err, phase, station del time, err, phase, station, method
return event return event