From c45f52510bfabf937576acb8677692e4e081dad8 Mon Sep 17 00:00:00 2001
From: Darius Arnold <mail@dariusarnold.de>
Date: Tue, 9 Apr 2019 16:57:37 +0200
Subject: [PATCH] Change checksignallength so it extracts the required
 parameters

from the PylotParameter instance itself. The function is only used in one place, so this change wont break anything else.
---
 pylot/core/pick/autopick.py |  3 +--
 pylot/core/pick/utils.py    | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pylot/core/pick/autopick.py b/pylot/core/pick/autopick.py
index a798fa6f..9134178c 100644
--- a/pylot/core/pick/autopick.py
+++ b/pylot/core/pick/autopick.py
@@ -786,8 +786,7 @@ class AutopickStation(object):
             zne += trH1_filt
             zne += trH2_filt
             minsiglength = self.signal_length_params.minsiglength
-        Pflag = checksignallength(zne, aicpick.getpick(), self.p_params.tsnrz, minsiglength,
-                                  self.signal_length_params.noisefactor, self.signal_length_params.minpercent,
+        Pflag = checksignallength(zne, aicpick.getpick(), minsiglength, self.pickparams,
                                   self.iplot, self.current_figure, self.current_linecolor)
         if Pflag == 0:
             self.p_results.marked = 'shortsignallength'
diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py
index 31f53eb1..11fe3093 100644
--- a/pylot/core/pick/utils.py
+++ b/pylot/core/pick/utils.py
@@ -757,7 +757,7 @@ def RMS(X):
     return np.sqrt(np.sum(np.power(X, 2)) / len(X))
 
 
-def checksignallength(X, pick, TSNR, minsiglength, nfac, minpercent, iplot=0, fig=None, linecolor='k'):
+def checksignallength(X, pick, minsiglength, pickparams, iplot=0, fig=None, linecolor='k'):
     """
     Function to detect spuriously picked noise peaks.
 
@@ -768,14 +768,10 @@ def checksignallength(X, pick, TSNR, minsiglength, nfac, minpercent, iplot=0, fi
     :type X: `~obspy.core.stream.Stream`
     :param pick: initial (AIC) P onset time
     :type pick: float
-    :param TSNR: length of time windows around initial pick [s]
-    :type TSNR: (T_noise, T_gap, T_signal)
     :param minsiglength: minium required signal length [s] to declare pick as P onset
     :type minsiglength: float
-    :param nfac: noise factor (nfac * noise level = threshold)
-    :type nfac: float
-    :param minpercent: minimum required percentage of samples above calculated threshold
-    :type minpercent: float
+    :param pickparams: PylotParameter instance that holds the current picker settings loaded from a .in file
+    :type pickparams: PylotParameter
     :param iplot: iplot, if iplot > 1, results are shown in figure
     :type iplot: int
     :param fig: Matplotlib figure to plot results in
@@ -787,6 +783,19 @@ def checksignallength(X, pick, TSNR, minsiglength, nfac, minpercent, iplot=0, fi
     :rtype: int
     """
 
+    """
+    Extract additional parameters from pickparams
+    :param TSNR: length of time windows around initial pick [s]
+    :type TSNR: (T_noise, T_gap, T_signal)
+    :param nfac: noise factor (nfac * noise level = threshold)
+    :type nfac: float
+    :param minpercent: minimum required percentage of samples above calculated threshold
+    :type minpercent: float
+    """
+    TSNR = pickparams["tsnrz"]
+    nfac = pickparams["noisefactor"]
+    minpercent = pickparams["minpercent"]
+
     plt_flag = 0
     try:
         iplot = int(iplot)