commiting changes to suppress output; necessary for fast calculation in active mode
This commit is contained in:
parent
f5fa4f4faf
commit
57a9444478
@ -218,7 +218,7 @@ class AICcf(CharacteristicFunction):
|
|||||||
|
|
||||||
def calcCF(self, data):
|
def calcCF(self, data):
|
||||||
|
|
||||||
print 'Calculating AIC ...'
|
#print 'Calculating AIC ...' ## MP MP output suppressed
|
||||||
x = self.getDataArray()
|
x = self.getDataArray()
|
||||||
xnp = x[0].data
|
xnp = x[0].data
|
||||||
nn = np.isnan(xnp)
|
nn = np.isnan(xnp)
|
||||||
@ -260,7 +260,7 @@ class HOScf(CharacteristicFunction):
|
|||||||
y = np.power(xnp, 3)
|
y = np.power(xnp, 3)
|
||||||
y1 = np.power(xnp, 2)
|
y1 = np.power(xnp, 2)
|
||||||
elif self.getOrder() == 4: # this is kurtosis
|
elif self.getOrder() == 4: # this is kurtosis
|
||||||
print 'Calculating kurtosis ...'
|
#print 'Calculating kurtosis ...' ## MP MP output suppressed
|
||||||
y = np.power(xnp, 4)
|
y = np.power(xnp, 4)
|
||||||
y1 = np.power(xnp, 2)
|
y1 = np.power(xnp, 2)
|
||||||
|
|
||||||
|
@ -43,7 +43,13 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None):
|
|||||||
LPick = None
|
LPick = None
|
||||||
EPick = None
|
EPick = None
|
||||||
PickError = None
|
PickError = None
|
||||||
|
<<<<<<< Updated upstream
|
||||||
print ("earllatepicker: Get earliest and latest possible pick relative to most likely pick ...")
|
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
|
x = X[0].data
|
||||||
t = np.arange(0, X[0].stats.npts / X[0].stats.sampling_rate,
|
t = np.arange(0, X[0].stats.npts / X[0].stats.sampling_rate,
|
||||||
|
Loading…
Reference in New Issue
Block a user