Skip to content
Snippets Groups Projects
Commit 1c4fc7f7 authored by Daniel Toyra's avatar Daniel Toyra
Browse files

Fixed some Python2 --> Python3 related issues: range is a list in 2, while a range in 3.

parent 4587b4b6
Branches
No related tags found
No related merge requests found
...@@ -597,6 +597,9 @@ class surfacemap(object): ...@@ -597,6 +597,9 @@ class surfacemap(object):
elif isinstance(m, list): elif isinstance(m, list):
nVals = range(n,n+1) nVals = range(n,n+1)
mVals.append(m) mVals.append(m)
elif isinstance(m, range):
nVals = range(n,n+1)
mVals.append(m)
elif isinstance(m,int): elif isinstance(m,int):
nVals = range(n,n+1) nVals = range(n,n+1)
mVals.append(range(m,m+1)) mVals.append(range(m,m+1))
...@@ -1373,6 +1376,11 @@ class surfacemap(object): ...@@ -1373,6 +1376,11 @@ class surfacemap(object):
Z = zernike(m[k], n, rho, phi) Z = zernike(m[k], n, rho, phi)
self.data[self.notNan] = self.data[self.notNan]-A[k]*Z[self.notNan] self.data[self.notNan] = self.data[self.notNan]-A[k]*Z[self.notNan]
self.zernikeRemoved = (m[k], n, A[k]) self.zernikeRemoved = (m[k], n, A[k])
elif isinstance(m, range):
for k in range(len(m)):
Z = zernike(m[k], n, rho, phi)
self.data[self.notNan] = self.data[self.notNan]-A[k]*Z[self.notNan]
self.zernikeRemoved = (m[k], n, A[k])
else: else:
Z = zernike(m, n, rho, phi) Z = zernike(m, n, rho, phi)
self.data[self.notNan] = self.data[self.notNan]-A*Z[self.notNan] self.data[self.notNan] = self.data[self.notNan]-A*Z[self.notNan]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment