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
Sebastian Steinlechner
pykat
Commits
dd829761
Commit
dd829761
authored
May 15, 2016
by
Daniel Toyra
Browse files
Removed RcRemoved as input to surfacemap __init__()
parent
0fedb516
Changes
1
Hide whitespace changes
Inline
Side-by-side
pykat/optics/maps.py
View file @
dd829761
...
...
@@ -43,7 +43,7 @@ class MirrorROQWeights:
class
surfacemap
(
object
):
def
__init__
(
self
,
name
,
maptype
,
size
=
None
,
center
=
None
,
step_size
=
1.0
,
scaling
=
1.0e-9
,
data
=
None
,
notNan
=
None
,
RcRemoved
=
None
,
zOffset
=
None
,
xyOffset
=
(.
0
,.
0
)):
notNan
=
None
,
zOffset
=
None
,
xyOffset
=
(.
0
,.
0
)):
'''
size, center, step_size, xyOffset are all tuples of the form (x, y),
i.e., (col, row).
...
...
@@ -70,7 +70,7 @@ class surfacemap(object):
self
.
center
=
center
self
.
step_size
=
step_size
self
.
scaling
=
scaling
self
.
RcRemoved
=
RcRemoved
self
.
_
RcRemoved
=
None
# Offset of fitted sphere. Proably unnecessary to have here.
self
.
zOffset
=
zOffset
self
.
__interp
=
None
...
...
@@ -1794,8 +1794,8 @@ def read_map(filename, mapFormat='finesse', scaling=1.0e-9, mapType='phase', fie
step
=
tuple
(
map
(
g
,
f
.
readline
().
split
(
':'
)[
1
].
strip
().
split
()))
scaling
=
float
(
f
.
readline
().
split
(
':'
)[
1
].
strip
())
data
=
np
.
loadtxt
(
filename
,
dtype
=
np
.
float64
,
ndmin
=
2
,
comments
=
'%'
)
data
=
np
.
loadtxt
(
filename
,
dtype
=
np
.
float64
,
ndmin
=
2
,
comments
=
'%'
)
return
surfacemap
(
name
,
maptype
,
size
,
center
,
step
,
scaling
,
data
)
elif
mapFormat
.
lower
()
==
'ligo'
or
mapFormat
.
lower
()
==
'zygo'
:
...
...
Write
Preview
Markdown
is supported
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