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

Re-implemented magnitude calculation within manual picking/location, yet on-going work

Browse Source
This commit is contained in:
Ludger Küperkoch 2019-06-04 12:29:53 +02:00
parent 102b7eafe3
commit bb313f0f49
3 changed files with 25 additions and 18 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):
''' '''
@ -3312,19 +3312,23 @@ class MainWindow(QMainWindow):
return None return None
wf_copy = self.get_data().getWFData().copy() wf_copy = self.get_data().getWFData().copy()
corr_wf = restitute_data(wf_copy, *self.metadata) corr_wf, rest_flag = restitute_data(wf_copy, self.metadata)
# if not rest_flag:
# raise ProcessingError('Restitution of waveform data failed!') if not rest_flag:
if type == 'ML': # raise ProcessingError('Restitution of waveform data failed!')
local_mag = LocalMagnitude(corr_wf, self.get_data().get_evt_data(), self.inputs.get('sstop'), print('Restitution of waveform data failed!')
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 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:
return None
def check4Loc(self): def check4Loc(self):
return self.picksNum() >= 4 return self.picksNum() >= 4

3
pylot/core/io/data.py
View File

@ -542,6 +542,9 @@ class Data(object):
information on the event to the actual data information on the event to the actual data
:param event: :param event:
""" """
if event is None:
print("applyEvent: Received None")
return
if self.isNew(): if self.isNew():
self.setEvtData(event) self.setEvtData(event)
else: else:

10
pylot/core/util/dataprocessing.py
View File

@ -644,11 +644,11 @@ def restitute_data(data, metadata, unit='VEL', force=False, ncores=0):
# better try restitution for smaller subsets of data (e.g. station by # better try restitution for smaller subsets of data (e.g. station by
# station) # station)
# if len(restflag) > 0: if len(restflag) > 0:
# restflag = bool(np.all(restflag)) restflag = bool(np.all(restflag))
# else: else:
# restflag = False restflag = False
return data return data, restflag
def get_prefilt(trace, tlow=(0.5, 0.9), thi=(5., 2.), verbosity=0): def get_prefilt(trace, tlow=(0.5, 0.9), thi=(5., 2.), verbosity=0):