marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

On the way to stable magnitude determination, still buggy!

Browse Source
This commit is contained in:
Ludger Küperkoch 2019-06-14 12:35:56 +02:00
parent ed9a7c27aa
commit 025822c485
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
PyLoT.py
View File

@ -2974,7 +2974,7 @@ class MainWindow(QMainWindow):
# os.remove(phasefile) # os.remove(phasefile)
self.get_data().applyEVTData(lt.read_location(locpath), typ='event') self.get_data().applyEVTData(lt.read_location(locpath), typ='event')
self.get_data().applyEVTData(self.calc_magnitude(), typ='event') #self.get_data().applyEVTData(self.calc_magnitude(), typ='event')
def init_array_tab(self): def init_array_tab(self):
''' '''
@ -3314,21 +3314,21 @@ class MainWindow(QMainWindow):
wf_copy = self.get_data().getWFData().copy() wf_copy = self.get_data().getWFData().copy()
corr_wf, rest_flag = restitute_data(wf_copy, self.metadata) corr_wf, rest_flag = restitute_data(wf_copy, self.metadata)
if not rest_flag: #if not rest_flag:
# raise ProcessingError('Restitution of waveform data failed!') # # raise ProcessingError('Restitution of waveform data failed!')
print('Restitution of waveform data failed!') # print('Restitution of waveform data failed!')
return None # return None
#else:
if type == 'ML':
local_mag = LocalMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('sstop'),
self.inputs.get('WAScaling'), verbosity=True)
return local_mag.updated_event()
elif type == 'Mw':
moment_mag = MomentMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('vp'),
self.inputs.get('Qp'), self.inputs.get('rho'), verbosity=True)
return moment_mag.updated_event()
else: else:
if type == 'ML': return None
local_mag = LocalMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('sstop'),
self.inputs.get('WAScaling'), verbosity=True)
return local_mag.updated_event()
elif type == 'Mw':
moment_mag = MomentMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('vp'),
self.inputs.get('Qp'), self.inputs.get('rho'), verbosity=True)
return moment_mag.updated_event()
else:
return None
def check4Loc(self): def check4Loc(self):
return self.picksNum() >= 4 return self.picksNum() >= 4

9
pylot/core/analysis/magnitude.py
View File

@ -6,7 +6,7 @@ Revised/extended summer 2017.
:author: Ludger Küperkoch / MAGS2 EP3 working group :author: Ludger Küperkoch / MAGS2 EP3 working group
""" """
import pdb
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import numpy as np import numpy as np
import obspy.core.event as ope import obspy.core.event as ope
@ -381,8 +381,13 @@ class MomentMagnitude(Magnitude):
# NLLoc: time_weight = 0 => do not use onset! # NLLoc: time_weight = 0 => do not use onset!
if a.time_weight == 0: if a.time_weight == 0:
continue continue
pick = a.pick_id.get_referred_object()
station = pick.waveform_id.station_code station = pick.waveform_id.station_code
if len(self.stream) <= 2:
print("Station:", station)
print("WARNING: No instrument corrected data available, \
no magnitude calculation possible! Go on.")
continue
pick = a.pick_id.get_referred_object()
scopy = self.stream.copy() scopy = self.stream.copy()
wf = scopy.select(station=station) wf = scopy.select(station=station)
if not wf: if not wf: