From 57a9444478c10afd9416b7b5a5a18dc65dce4593 Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Mon, 14 Sep 2015 11:01:23 +0200 Subject: [PATCH] commiting changes to suppress output; necessary for fast calculation in active mode --- pylot/core/pick/CharFuns.py | 4 ++-- pylot/core/pick/utils.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pylot/core/pick/CharFuns.py b/pylot/core/pick/CharFuns.py index b3ad1f07..2f6e8cd8 100644 --- a/pylot/core/pick/CharFuns.py +++ b/pylot/core/pick/CharFuns.py @@ -218,7 +218,7 @@ class AICcf(CharacteristicFunction): def calcCF(self, data): - print 'Calculating AIC ...' + #print 'Calculating AIC ...' ## MP MP output suppressed x = self.getDataArray() xnp = x[0].data nn = np.isnan(xnp) @@ -260,7 +260,7 @@ class HOScf(CharacteristicFunction): y = np.power(xnp, 3) y1 = np.power(xnp, 2) elif self.getOrder() == 4: # this is kurtosis - print 'Calculating kurtosis ...' + #print 'Calculating kurtosis ...' ## MP MP output suppressed y = np.power(xnp, 4) y1 = np.power(xnp, 2) diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py index 052c2870..80277623 100644 --- a/pylot/core/pick/utils.py +++ b/pylot/core/pick/utils.py @@ -43,7 +43,13 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None): LPick = None EPick = None PickError = None +<<<<<<< Updated upstream print ("earllatepicker: Get earliest and latest possible pick relative to most likely pick ...") +======= + # MP MP ++ output suppressed + #print 'earllatepicker: Get earliest and latest possible pick relative to most likely pick ...' + # MP MP -- +>>>>>>> Stashed changes x = X[0].data t = np.arange(0, X[0].stats.npts / X[0].stats.sampling_rate,