diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION deleted file mode 100644 index 518a60d7..00000000 --- a/pylot/RELEASE-VERSION +++ /dev/null @@ -1 +0,0 @@ -f135-dirty diff --git a/pylot/core/io/phases.py b/pylot/core/io/phases.py index 9897c664..9db9fb3d 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