[hotfix] something went wrong trying to merge/rebase develop
This commit is contained in:
		
							parent
							
								
									27ea20fa47
								
							
						
					
					
						commit
						9f1672d793
					
				@ -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))
 | 
					          'stations on {} cores.'.format(len(input_tuples), ncores_str))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pool = gen_Pool(ncores)
 | 
					    pool = gen_Pool(ncores)
 | 
				
			||||||
    result = pool.map(call_autopickstation, input_tuples)
 | 
					    results = pool.map(call_autopickstation, input_tuples)
 | 
				
			||||||
    pool.close()
 | 
					    pool.close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ncores == 1:
 | 
					 | 
				
			||||||
        results = serial_picking(input_tuples)
 | 
					 | 
				
			||||||
    else:
 | 
					 | 
				
			||||||
        results = parallel_picking(input_tuples, ncores)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    for result, wfstream in results:
 | 
					    for result, wfstream in results:
 | 
				
			||||||
        if type(result) == dict:
 | 
					        if type(result) == dict:
 | 
				
			||||||
            station = result['station']
 | 
					            station = result['station']
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user