merge origin develop into develop

2017-05-10 15:48:02 +02:00
parent 862fb3240a 89a70aae0b
commit dc656e5c57
2 changed files with 2 additions and 1 deletions
--- a/pylot/core/pick/utils.py
+++ b/pylot/core/pick/utils.py
@@ -130,7 +130,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None, stealth_mode=False):
    if iplot:
        return EPick, LPick, PickError, fig
    else:
-        return Epick, LPick, PickError
+        return EPick, LPick, PickError


 def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None):