Reversed some changes of former commit accidently made.

This commit is contained in:
Ludger Küperkoch 2017-08-16 16:49:47 +02:00
parent b64009e525
commit 5920c64ec5

View File

@ -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:
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