Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop
This commit is contained in:
		
						commit
						e0e0be48c7
					
				
							
								
								
									
										21
									
								
								autoPyLoT.py
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								autoPyLoT.py
									
									
									
									
									
								
							| @ -195,6 +195,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|             eventpath = eventpath.replace(SEPARATOR, '/') | ||||
|             events[index] = eventpath | ||||
| 
 | ||||
|         glocflag = locflag | ||||
|         for eventpath in events: | ||||
|             evID = os.path.split(eventpath)[-1] | ||||
|             fext = '.xml' | ||||
| @ -210,9 +211,6 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|                 data.setEvtData(pylot_event) | ||||
|             if fnames == 'None': | ||||
|                 data.setWFData(glob.glob(os.path.join(datapath, eventpath, '*'))) | ||||
|                 station = 'all' | ||||
|                 if savepath == None or savepath == 'None': | ||||
|                     savepath = eventpath | ||||
|                 # the following is necessary because within | ||||
|                 # multiple event processing no event ID is provided | ||||
|                 # in autopylot.in | ||||
| @ -308,8 +306,8 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|                                                      parameter.get('rho'), True, \ | ||||
|                                                      iplot) | ||||
|                         # update pick with moment property values (w0, fc, Mo) | ||||
|                         for station, props in moment_mag.moment_props.items(): | ||||
|                             picks[station]['P'].update(props) | ||||
|                         for stats, props in moment_mag.moment_props.items(): | ||||
|                             picks[stats]['P'].update(props) | ||||
|                         evt = moment_mag.updated_event() | ||||
|                         net_mw = moment_mag.net_magnitude() | ||||
|                         print("Network moment magnitude: %4.1f" % net_mw.mag) | ||||
| @ -319,8 +317,8 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|                         local_mag = LocalMagnitude(corr_dat, evt, | ||||
|                                                    parameter.get('sstop'), | ||||
|                                                    WAscaling, True, iplot) | ||||
|                         for station, amplitude in local_mag.amplitudes.items(): | ||||
|                             picks[station]['S']['Ao'] = amplitude.generic_amplitude | ||||
|                         for stats, amplitude in local_mag.amplitudes.items(): | ||||
|                             picks[stats]['S']['Ao'] = amplitude.generic_amplitude | ||||
|                         print("Local station magnitudes scaled with:") | ||||
|                         print("log(Ao) + %f * log(r) + %f * r + %f" % (WAscaling[0], | ||||
|                                                                        WAscaling[1], | ||||
| @ -381,8 +379,8 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|                                                          parameter.get('rho'), True, \ | ||||
|                                                          iplot) | ||||
|                             # update pick with moment property values (w0, fc, Mo) | ||||
|                             for station, props in moment_mag.moment_props.items(): | ||||
|                                 picks[station]['P'].update(props) | ||||
|                             for stats, props in moment_mag.moment_props.items(): | ||||
|                                 picks[stats]['P'].update(props) | ||||
|                             evt = moment_mag.updated_event() | ||||
|                             net_mw = moment_mag.net_magnitude() | ||||
|                             print("Network moment magnitude: %4.1f" % net_mw.mag) | ||||
| @ -392,8 +390,8 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|                             local_mag = LocalMagnitude(corr_dat, evt, | ||||
|                                                        parameter.get('sstop'), | ||||
|                                                        WAscaling, True, iplot) | ||||
|                             for station, amplitude in local_mag.amplitudes.items(): | ||||
|                                 picks[station]['S']['Ao'] = amplitude.generic_amplitude | ||||
|                             for stats, amplitude in local_mag.amplitudes.items(): | ||||
|                                 picks[stats]['S']['Ao'] = amplitude.generic_amplitude | ||||
|                             print("Local station magnitudes scaled with:") | ||||
|                             print("log(Ao) + %f * log(r) + %f * r + %f" % (WAscaling[0], | ||||
|                                                                            WAscaling[1], | ||||
| @ -447,6 +445,7 @@ def autoPyLoT(input_dict=None, parameter=None, inputfile=None, fnames=None, even | ||||
|                            ------------------------------------------'''.format \ | ||||
|                             (version=_getVersionString()) % evID | ||||
|             print(endsplash) | ||||
|             locflag = glocflag | ||||
|             if locflag == 0: | ||||
|                 print("autoPyLoT was running in non-location mode!") | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user