From 2bb99a6f2ed66858d04676ef5d3f38f7c20c4f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Thu, 10 Dec 2015 12:02:32 +0100 Subject: [PATCH] bugfix: Even if no location is possible, autoPyLoT can handle finalpicks. --- autoPyLoT.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/autoPyLoT.py b/autoPyLoT.py index 658739fb..00068c73 100755 --- a/autoPyLoT.py +++ b/autoPyLoT.py @@ -107,7 +107,7 @@ def autoPyLoT(inputfile): ########################################################## # !automated picking starts here! picks = autopickevent(wfdat, parameter) - + finalpicks = picks ########################################################## # locating if locflag == 1: @@ -199,8 +199,11 @@ def autoPyLoT(inputfile): # write phase files for various location routines # HYPO71 hypo71file = '%s/autoPyLoT_HYPO71.pha' % event - if finalpicks.getpicdic() is not None: - writephases(finalpicks.getpicdic(), 'HYPO71', hypo71file) + if hasattr(finalpicks, 'getpicdic'): + if finalpicks.getpicdic() is not None: + writephases(finalpicks.getpicdic(), 'HYPO71', hypo71file) + else: + writephases(picks, 'HYPO71', hypo71file) else: writephases(picks, 'HYPO71', hypo71file) @@ -222,7 +225,7 @@ def autoPyLoT(inputfile): ########################################################## # !automated picking starts here! picks = autopickevent(wfdat, parameter) - + finalpicks = picks ########################################################## # locating if locflag == 1: @@ -312,8 +315,11 @@ def autoPyLoT(inputfile): # write phase files for various location routines # HYPO71 hypo71file = '%s/%s/autoPyLoT_HYPO71.pha' % (datapath, parameter.getParam('eventID')) - if finalpicks.getpicdic() is not None: - writephases(finalpicks.getpicdic(), 'HYPO71', hypo71file) + if hasattr(finalpicks, 'getpicdic'): + if finalpicks.getpicdic() is not None: + writephases(finalpicks.getpicdic(), 'HYPO71', hypo71file) + else: + writephases(picks, 'HYPO71', hypo71file) else: writephases(picks, 'HYPO71', hypo71file)