Reversed some changes of former commit accidently made.
This commit is contained in:
		
							parent
							
								
									b64009e525
								
							
						
					
					
						commit
						5920c64ec5
					
				@ -52,28 +52,28 @@ def autopickevent(data, param, iplot=0, fig_dict=None, ncores=0, metadata=None,
 | 
				
			|||||||
    for station in stations:
 | 
					    for station in stations:
 | 
				
			||||||
        topick = data.select(station=station)
 | 
					        topick = data.select(station=station)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        #if iplot == None or iplot == 'None' or iplot == 0:
 | 
					        if iplot == None or iplot == 'None' or iplot == 0:
 | 
				
			||||||
        #    input_tuples.append((topick, param, apverbose, metadata, origin))
 | 
					            input_tuples.append((topick, param, apverbose, metadata, origin))
 | 
				
			||||||
        #if iplot > 0:
 | 
					        if iplot > 0:
 | 
				
			||||||
        all_onsets[station] = autopickstation(topick, param, verbose=apverbose,
 | 
					            all_onsets[station] = autopickstation(topick, param, verbose=apverbose,
 | 
				
			||||||
                                              iplot=iplot, fig_dict=fig_dict,
 | 
					                                                  iplot=iplot, fig_dict=fig_dict,
 | 
				
			||||||
                                              metadata=metadata, origin=origin)
 | 
					                                                  metadata=metadata, origin=origin)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #if iplot > 0:
 | 
					    if iplot > 0:
 | 
				
			||||||
    #    print('iPlot Flag active: NO MULTIPROCESSING possible.')
 | 
					        print('iPlot Flag active: NO MULTIPROCESSING possible.')
 | 
				
			||||||
    #    return all_onsets
 | 
					        return all_onsets
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #pool = gen_Pool(ncores)
 | 
					    pool = gen_Pool(ncores)
 | 
				
			||||||
    #result = pool.map(call_autopickstation, input_tuples)
 | 
					    result = pool.map(call_autopickstation, input_tuples)
 | 
				
			||||||
    #pool.close()
 | 
					    pool.close()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #for pick in result:
 | 
					    for pick in result:
 | 
				
			||||||
    #    if pick:
 | 
					        if pick:
 | 
				
			||||||
    #        station = pick['station']
 | 
					            station = pick['station']
 | 
				
			||||||
    #        pick.pop('station')
 | 
					            pick.pop('station')
 | 
				
			||||||
    #        all_onsets[station] = pick
 | 
					            all_onsets[station] = pick
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    #return all_onsets
 | 
					    return all_onsets
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # quality control
 | 
					    # quality control
 | 
				
			||||||
    # median check and jackknife on P-onset times
 | 
					    # median check and jackknife on P-onset times
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user