[Bugfix] Wrong derivation of method_id.
This commit is contained in:
parent
4244c4209b
commit
7009983925
@ -1 +1 @@
|
|||||||
f86f-dirty
|
4244c-dirty
|
||||||
|
@ -875,21 +875,21 @@ def getQualitiesfromxml(xmlnames, ErrorsP, ErrorsS, plotflag=1):
|
|||||||
arrivals_copy = cat_copy.events[0].picks
|
arrivals_copy = cat_copy.events[0].picks
|
||||||
# Prefere manual picks if qualities are sufficient!
|
# Prefere manual picks if qualities are sufficient!
|
||||||
for Pick in arrivals:
|
for Pick in arrivals:
|
||||||
if Pick.method_id.id == 'manual':
|
if (Pick.method_id.id).split('/')[1] == 'manual':
|
||||||
mstation = Pick.waveform_id.station_code
|
mstation = Pick.waveform_id.station_code
|
||||||
mstation_ext = mstation + '_'
|
mstation_ext = mstation + '_'
|
||||||
for mpick in arrivals_copy:
|
for mpick in arrivals_copy:
|
||||||
if mpick.phase_hint[0] == 'P':
|
if mpick.phase_hint[0] == 'P':
|
||||||
if ((mpick.waveform_id.station_code == mstation) or \
|
if ((mpick.waveform_id.station_code == mstation) or \
|
||||||
(mpick.waveform_id.station_code == mstation_ext)) and \
|
(mpick.waveform_id.station_code == mstation_ext)) and \
|
||||||
(mpick.method_id == 'auto') and \
|
((mpick.method_id).split('/')[1] == 'auto') and \
|
||||||
(mpick.time_errors['uncertainty'] <= ErrorsP[3]):
|
(mpick.time_errors['uncertainty'] <= ErrorsP[3]):
|
||||||
del mpick
|
del mpick
|
||||||
break
|
break
|
||||||
elif mpick.phase_hint[0] == 'S':
|
elif mpick.phase_hint[0] == 'S':
|
||||||
if ((mpick.waveform_id.station_code == mstation) or \
|
if ((mpick.waveform_id.station_code == mstation) or \
|
||||||
(mpick.waveform_id.station_code == mstation_ext)) and \
|
(mpick.waveform_id.station_code == mstation_ext)) and \
|
||||||
(mpick.method_id == 'auto') and \
|
((mpick.method_id).split('/')[1] == 'auto') and \
|
||||||
(mpick.time_errors['uncertainty'] <= ErrorsS[3]):
|
(mpick.time_errors['uncertainty'] <= ErrorsS[3]):
|
||||||
del mpick
|
del mpick
|
||||||
break
|
break
|
||||||
|
Loading…
Reference in New Issue
Block a user