From cd63896060b273e616f1e29c3134edb7545ae2d2 Mon Sep 17 00:00:00 2001 From: Darius Arnold Date: Tue, 9 Apr 2019 18:13:01 +0200 Subject: [PATCH] Add init to ARHcf that extracts parameters from pickparam --- pylot/core/pick/autopick.py | 4 ++-- pylot/core/pick/charfuns.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py index 9a8c7bc7..965567cc 100644 --- a/pylot/core/pick/autopick.py +++ b/pylot/core/pick/autopick.py @@ -992,7 +992,7 @@ class AutopickStation(object): # calculate initial CF based on autoregression if self.s_params.algoS == 'ARH': - arhcf1 = ARHcf(h_copy, cuttimesh, self.s_params.tpred1h, self.s_params.Sarorder, self.s_params.tdet1h, self.p_params.addnoise) + arhcf1 = ARHcf(h_copy, cuttimesh, self.s_params.tdet1h, self.s_params.tpred1h, self.pickparams) elif self.s_params.algoS == 'AR3': arhcf1 = AR3Ccf(h_copy, cuttimesh, self.s_params.tpred1h, self.s_params.Sarorder, self.s_params.tdet1h, self.p_params.addnoise) return arhcf1 @@ -1053,7 +1053,7 @@ class AutopickStation(object): # calculate second cf if self.s_params.algoS == 'ARH': - arhcf2 = ARHcf(h_copy, cuttimesh2, self.s_params.tpred2h, self.s_params.Sarorder, self.s_params.tdet2h, self.p_params.addnoise) + arhcf2 = ARHcf(h_copy, cuttimesh2, self.s_params.tdet2h, self.s_params.tpred2h, self.pickparams) elif self.s_params.algoS == 'AR3': arhcf2 = AR3Ccf(h_copy, cuttimesh2, self.s_params.tpred2h, self.s_params.Sarorder, self.s_params.tdet2h, self.p_params.addnoise) # save cf for later plotting diff --git a/pylot/core/pick/charfuns.py b/pylot/core/pick/charfuns.py index ec879865..7a2e1f75 100644 --- a/pylot/core/pick/charfuns.py +++ b/pylot/core/pick/charfuns.py @@ -441,6 +441,9 @@ class ARZcf(CharacteristicFunction): class ARHcf(CharacteristicFunction): + def __init__(self, data, cut, t1, t2, pickparams): + super(ARHcf, self).__init__(data, cut, t1=t1, t2=t2, order=pickparams["Sarorder"], fnoise=pickparams["addnoise"]) + def calcCF(self, data): """ Function to calculate a characteristic function using autoregressive modelling of the waveform of