Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
finesse
pykat
Commits
7aa859b6
Commit
7aa859b6
authored
Dec 02, 2016
by
Daniel Toyra
Browse files
Fixed a python 2/3 problem with range
parent
b572a7bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
pykat/optics/maps.py
View file @
7aa859b6
...
...
@@ -636,9 +636,6 @@ class surfacemap(object):
elif
isinstance
(
m
,
list
):
nVals
=
range
(
n
,
n
+
1
)
mVals
.
append
(
m
)
elif
isinstance
(
m
,
range
):
nVals
=
range
(
n
,
n
+
1
)
mVals
.
append
(
m
)
elif
isinstance
(
m
,
int
):
nVals
=
range
(
n
,
n
+
1
)
mVals
.
append
(
range
(
m
,
m
+
1
))
...
...
@@ -1415,11 +1412,11 @@ class surfacemap(object):
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
])
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
])
#
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
:
Z
=
zernike
(
m
,
n
,
rho
,
phi
)
self
.
data
[
self
.
notNan
]
=
self
.
data
[
self
.
notNan
]
-
A
*
Z
[
self
.
notNan
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment