From 5b8e2da59ec34474bcb1ac55f1428e7c09dc4215 Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Mon, 28 Sep 2015 12:24:28 +0200 Subject: [PATCH] *** empty log message *** --- pylot/core/active/seismicshot.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pylot/core/active/seismicshot.py b/pylot/core/active/seismicshot.py index 5a13651f..5b21024a 100644 --- a/pylot/core/active/seismicshot.py +++ b/pylot/core/active/seismicshot.py @@ -257,17 +257,13 @@ class SeismicShot(object): #raise ValueError('ambigious or empty traceID: %s' % traceID) - def pickTraces(self, traceID, pickmethod, windowsize, folm = 0.6, HosAic = 'hos'): ########## input variables ########## - # LOCALMAX NOT IMPLEMENTED! + def pickTraces(self, traceID, windowsize, folm = 0.6, HosAic = 'hos'): ########## input variables ########## ''' Intitiate picking for a trace. :param: traceID :type: int - :param: pickmethod, use either 'threshold' or 'localmax' method. (localmax not yet implemented 04_08_15) - :type: string - :param: cutwindow (equals HOScf 'cut' variable) :type: tuple @@ -291,13 +287,7 @@ class SeismicShot(object): self.timeArray[traceID] = hoscf.getTimeArray() - if pickmethod == 'threshold': - aiccftime, hoscftime = self.threshold(hoscf, aiccf, windowsize, self.getPickwindow(traceID), folm) - - #setpick = {'threshold':self.threshold, - # 'localmax':self.localmax} - - #aiccftime, hoscftime = setpick[pickmethod](hoscf, aiccf, windowsize, pickwindow) + aiccftime, hoscftime = self.threshold(hoscf, aiccf, windowsize, self.getPickwindow(traceID), folm) setHosAic = {'hos': hoscftime, 'aic': aiccftime} @@ -487,7 +477,6 @@ class SeismicShot(object): :param: (tnoise, tgap, tsignal), as used in pylot SNR ''' - from pylot.core.pick.utils import getSNR tgap = self.getTgap()