marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
marcel
2017-09-18 11:24:57 +02:00
parent 330e15441e 6d0083040c
commit 8a2bb65581
3 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pylot/core/pick/charfuns.py
+9 -6
View File
@@ -222,9 +222,9 @@ class AICcf(CharacteristicFunction):
x = self.getDataArray()
xnp = x[0].data
nn = np.isnan(xnp)
if len(nn) > 1:
xnp[nn] = 0
ind = np.where(~np.isnan(xnp))[0]
if ind.size:
xnp[:ind[0]] = xnp[ind[0]]
datlen = len(xnp)
k = np.arange(1, datlen)
cf = np.zeros(datlen)
@@ -335,7 +335,8 @@ class ARZcf(CharacteristicFunction):
cf = tap * cf
io = np.where(cf == 0)
ino = np.where(cf > 0)
cf[io] = cf[ino[0][0]]
if np.size(ino):
cf[io] = cf[ino[0][0]]
self.cf = cf
self.xcf = x
@@ -467,7 +468,8 @@ class ARHcf(CharacteristicFunction):
cf = tap * cf
io = np.where(cf == 0)
ino = np.where(cf > 0)
cf[io] = cf[ino[0][0]]
if np.size(ino):
cf[io] = cf[ino[0][0]]
self.cf = cf
self.xcf = xnp
@@ -609,7 +611,8 @@ class AR3Ccf(CharacteristicFunction):
cf = tap * cf
io = np.where(cf == 0)
ino = np.where(cf > 0)
cf[io] = cf[ino[0][0]]
if np.size(ino):
cf[io] = cf[ino[0][0]]
self.cf = cf
self.xcf = xnp