Some changes to be actual to Python2.7
This commit is contained in:
parent
41a2e840f8
commit
75ffe0c37a
@ -155,7 +155,7 @@ class CharacteristicFunction(object):
|
|||||||
stop = self.cut[1] / self.dt
|
stop = self.cut[1] / self.dt
|
||||||
zz = self.orig_data.copy()
|
zz = self.orig_data.copy()
|
||||||
z1 = zz[0].copy()
|
z1 = zz[0].copy()
|
||||||
zz[0].data = z1.data[start:stop]
|
zz[0].data = z1.data[int(start):int(stop)]
|
||||||
data = zz
|
data = zz
|
||||||
return data
|
return data
|
||||||
elif len(self.orig_data) == 2:
|
elif len(self.orig_data) == 2:
|
||||||
@ -171,8 +171,8 @@ class CharacteristicFunction(object):
|
|||||||
hh = self.orig_data.copy()
|
hh = self.orig_data.copy()
|
||||||
h1 = hh[0].copy()
|
h1 = hh[0].copy()
|
||||||
h2 = hh[1].copy()
|
h2 = hh[1].copy()
|
||||||
hh[0].data = h1.data[start:stop]
|
hh[0].data = h1.data[int(start):int(stop)]
|
||||||
hh[1].data = h2.data[start:stop]
|
hh[1].data = h2.data[int(start):int(stop)]
|
||||||
data = hh
|
data = hh
|
||||||
return data
|
return data
|
||||||
elif len(self.orig_data) == 3:
|
elif len(self.orig_data) == 3:
|
||||||
@ -189,9 +189,9 @@ class CharacteristicFunction(object):
|
|||||||
h1 = hh[0].copy()
|
h1 = hh[0].copy()
|
||||||
h2 = hh[1].copy()
|
h2 = hh[1].copy()
|
||||||
h3 = hh[2].copy()
|
h3 = hh[2].copy()
|
||||||
hh[0].data = h1.data[start:stop]
|
hh[0].data = h1.data[int(start):int(stop)]
|
||||||
hh[1].data = h2.data[start:stop]
|
hh[1].data = h2.data[int(start):int(stop)]
|
||||||
hh[2].data = h3.data[start:stop]
|
hh[2].data = h3.data[int(start):int(stop)]
|
||||||
data = hh
|
data = hh
|
||||||
return data
|
return data
|
||||||
else:
|
else:
|
||||||
@ -263,10 +263,9 @@ class HOScf(CharacteristicFunction):
|
|||||||
|
|
||||||
#Initialisation
|
#Initialisation
|
||||||
#t2: long term moving window
|
#t2: long term moving window
|
||||||
ilta = round(self.getTime2() / self.getIncrement())
|
ilta = int(round(self.getTime2() / self.getIncrement()))
|
||||||
lta = y[0]
|
lta = y[0]
|
||||||
lta1 = y1[0]
|
lta1 = y1[0]
|
||||||
|
|
||||||
#moving windows
|
#moving windows
|
||||||
LTA = np.zeros(len(xnp))
|
LTA = np.zeros(len(xnp))
|
||||||
for j in range(0, len(xnp)):
|
for j in range(0, len(xnp)):
|
||||||
|
Loading…
Reference in New Issue
Block a user