From 9f1672d7930eafc23f546e318aae53e2d8452296 Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 12 Jul 2018 14:17:06 +0200 Subject: [PATCH 1/2] [hotfix] something went wrong trying to merge/rebase develop --- pylot/core/pick/autopick.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py index e2928b59..75756e9a 100644 --- a/pylot/core/pick/autopick.py +++ b/pylot/core/pick/autopick.py @@ -89,15 +89,9 @@ def autopickevent(data, param, iplot=0, fig_dict=None, fig_dict_wadatijack=None, 'stations on {} cores.'.format(len(input_tuples), ncores_str)) pool = gen_Pool(ncores) - result = pool.map(call_autopickstation, input_tuples) + results = pool.map(call_autopickstation, input_tuples) pool.close() - if ncores == 1: - results = serial_picking(input_tuples) - else: - results = parallel_picking(input_tuples, ncores) - - for result, wfstream in results: if type(result) == dict: station = result['station'] From a9636caf732dc2f12960ecdddd5742427960f3fe Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 17 Jul 2018 14:44:31 +0200 Subject: [PATCH 2/2] [bugfix] picks for S and P were deleted when wadati check failed --- pylot/core/pick/utils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py index 96878c4d..b5a85149 100644 --- a/pylot/core/pick/utils.py +++ b/pylot/core/pick/utils.py @@ -639,11 +639,11 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None): # check, if deviation is larger than adjusted if wddiff > dttolerance: # remove pick from dictionary - pickdic.pop(key) - # # mark onset and downgrade S-weight to 9 + # # mark onset and downgrade S-weight to 9, also set SPE to None (disregarded in GUI) # # (not used anymore) - # marker = 'badWadatiCheck' - # pickdic[key]['S']['weight'] = 9 + marker = 'badWadatiCheck' + pickdic[key]['S']['weight'] = 9 + pickdic[key]['S']['spe'] = None badstations.append(key) ibad += 1 else: @@ -655,8 +655,7 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None): checkedSPtime = pickdic[key]['S']['mpp'] - pickdic[key]['P']['mpp'] checkedSPtimes.append(checkedSPtime) - pickdic[key]['S']['marked'] = marker - #pickdic[key]['S']['marked'] = marker + pickdic[key]['S']['marked'] = marker print("wadaticheck: the following stations failed the check:") print(badstations)