From 70099839250829a3c22996d6f13fb296fa13ed62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Mon, 31 Jul 2017 14:17:06 +0200 Subject: [PATCH] [Bugfix] Wrong derivation of method_id. --- pylot/RELEASE-VERSION | 2 +- pylot/core/io/phases.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 63b48cb8..0d3f6713 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -f86f-dirty +4244c-dirty diff --git a/pylot/core/io/phases.py b/pylot/core/io/phases.py index 5d275869..58b4a287 100644 --- a/pylot/core/io/phases.py +++ b/pylot/core/io/phases.py @@ -875,21 +875,21 @@ def getQualitiesfromxml(xmlnames, ErrorsP, ErrorsS, plotflag=1): arrivals_copy = cat_copy.events[0].picks # Prefere manual picks if qualities are sufficient! 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_ext = mstation + '_' for mpick in arrivals_copy: if mpick.phase_hint[0] == 'P': if ((mpick.waveform_id.station_code == mstation) or \ (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]): del mpick break elif mpick.phase_hint[0] == 'S': if ((mpick.waveform_id.station_code == mstation) or \ (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]): del mpick break