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

Add init to HOScf that extracts parameters from pickparams

Browse Source
This commit is contained in:
Darius Arnold 2019-04-09 17:30:05 +02:00
parent d45a5ccf0d
commit ab6e74c482
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylot/core/pick/autopick.py
View File

@ -834,7 +834,7 @@ class AutopickStation(object):
# calculate first CF
if self.p_params.algoP == 'HOS':
self.cf1 = HOScf(z_copy, cuttimes, self.p_params.tlta, self.p_params.hosorder)
self.cf1 = HOScf(z_copy, cuttimes, self.pickparams)
elif self.p_params.algoP == 'ARZ':
self.cf1 = ARZcf(z_copy, cuttimes, self.p_params.tpred1z, self.p_params.Parorder, self.p_params.tdet1z,
self.p_params.addnoise)
@ -884,7 +884,7 @@ class AutopickStation(object):
# determine new times around initial onset
cuttimes2 = self._calculate_cuttimes('P', 2)
if self.p_params.algoP == 'HOS':
self.cf2 = HOScf(z_copy, cuttimes2, self.p_params.tlta, self.p_params.hosorder)
self.cf2 = HOScf(z_copy, cuttimes2, self.pickparams)
elif self.p_params.algoP == 'ARZ':
self.cf2 = ARZcf(z_copy, cuttimes2, self.p_params.tpred2z, self.p_params.Parorder, self.p_params.tdet2z, self.p_params.addnoise)
else:

7
pylot/core/pick/charfuns.py
View File

@ -243,6 +243,13 @@ class AICcf(CharacteristicFunction):
class HOScf(CharacteristicFunction):
def __init__(self, data, cut, pickparams):
"""
Call parent constructor while extracting the right parameters:
:param pickparams: PylotParameters instance
"""
super(HOScf, self).__init__(data, cut, pickparams["tlta"], pickparams["hosorder"])
def calcCF(self, data):
"""
Function to calculate skewness (statistics of order 3) or kurtosis