From 5920c64ec55ee3063372a21c069982e3134373ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 16 Aug 2017 16:49:47 +0200 Subject: [PATCH] Reversed some changes of former commit accidently made. --- pylot/core/pick/autopick.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py index 03fed72c..ca328e52 100644 --- a/pylot/core/pick/autopick.py +++ b/pylot/core/pick/autopick.py @@ -52,28 +52,28 @@ def autopickevent(data, param, iplot=0, fig_dict=None, ncores=0, metadata=None, for station in stations: topick = data.select(station=station) - #if iplot == None or iplot == 'None' or iplot == 0: - # input_tuples.append((topick, param, apverbose, metadata, origin)) - #if iplot > 0: - all_onsets[station] = autopickstation(topick, param, verbose=apverbose, - iplot=iplot, fig_dict=fig_dict, - metadata=metadata, origin=origin) + if iplot == None or iplot == 'None' or iplot == 0: + input_tuples.append((topick, param, apverbose, metadata, origin)) + if iplot > 0: + all_onsets[station] = autopickstation(topick, param, verbose=apverbose, + iplot=iplot, fig_dict=fig_dict, + metadata=metadata, origin=origin) - #if iplot > 0: - # print('iPlot Flag active: NO MULTIPROCESSING possible.') - # return all_onsets + if iplot > 0: + print('iPlot Flag active: NO MULTIPROCESSING possible.') + return all_onsets - #pool = gen_Pool(ncores) - #result = pool.map(call_autopickstation, input_tuples) - #pool.close() + pool = gen_Pool(ncores) + result = pool.map(call_autopickstation, input_tuples) + pool.close() - #for pick in result: - # if pick: - # station = pick['station'] - # pick.pop('station') - # all_onsets[station] = pick + for pick in result: + if pick: + station = pick['station'] + pick.pop('station') + all_onsets[station] = pick - #return all_onsets + return all_onsets # quality control # median check and jackknife on P-onset times