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
d612ed3d
Commit
d612ed3d
authored
Feb 20, 2017
by
Daniel Brown
Browse files
updating version and changes to beam tracing
parent
b0d450a8
Pipeline
#1799
passed with stage
in 23 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pykat/__init__.py
View file @
d612ed3d
...
...
@@ -3,7 +3,7 @@ from __future__ import division
from
__future__
import
print_function
from
__future__
import
unicode_literals
__version__
=
"1.0.1
7
"
__version__
=
"1.0.1
8
"
# This flag is used to switch on the gui features in pkat at import time
USE_GUI
=
False
...
...
pykat/components.py
View file @
d612ed3d
...
...
@@ -478,9 +478,9 @@ class AbstractMirrorComponent(Component):
self
.
Rc
=
value
elif
key
in
[
"M"
,
"m"
,
"Mass"
,
"mass"
]:
self
.
mass
=
value
elif
key
in
[
"xbeta"
,
"xBeta"
]:
elif
key
in
[
"xbeta"
,
"xBeta"
,
"yaw"
]:
self
.
xbeta
=
value
elif
key
in
[
"ybeta"
,
"yBeta"
]:
elif
key
in
[
"ybeta"
,
"yBeta"
,
"pitch"
]:
self
.
ybeta
=
value
elif
key
in
[
"x_off"
]:
self
.
x_offset
=
value
...
...
@@ -504,7 +504,8 @@ class AbstractMirrorComponent(Component):
return
True
class
mirror
(
AbstractMirrorComponent
):
def
__init__
(
self
,
name
,
node1
,
node2
,
R
=
None
,
T
=
None
,
L
=
None
,
phi
=
0
,
Rcx
=
None
,
Rcy
=
None
,
xbeta
=
None
,
ybeta
=
None
,
mass
=
None
,
r_ap
=
None
):
def
__init__
(
self
,
name
,
node1
,
node2
,
R
=
None
,
T
=
None
,
L
=
None
,
phi
=
0
,
Rcx
=
None
,
Rcy
=
None
,
xbeta
=
None
,
ybeta
=
None
,
mass
=
None
,
r_ap
=
None
):
super
(
mirror
,
self
).
__init__
(
name
,
R
,
T
,
L
,
phi
,
Rcx
,
Rcy
,
xbeta
,
ybeta
,
mass
,
r_ap
)
self
.
_requested_node_names
.
append
(
node1
)
...
...
pykat/finesse.py
View file @
d612ed3d
...
...
@@ -646,6 +646,7 @@ class KatRun2D(object):
def
__init__
(
self
):
self
.
_unfreeze
()
self
.
runtime
=
None
self
.
runDateTime
=
None
self
.
startDateTime
=
datetime
.
datetime
.
now
()
self
.
x
=
None
self
.
y
=
None
...
...
pykat/optics/gaussian_beams.py
View file @
d612ed3d
...
...
@@ -85,7 +85,7 @@ class BeamParam(object):
def
zr
(
self
):
return
self
.
__q
.
imag
@
property
def
w
(
self
):
def
w
(
self
,
z
=
None
):
return
np
.
abs
(
self
.
__q
)
*
np
.
sqrt
(
self
.
__lambda
/
(
self
.
__nr
*
math
.
pi
*
self
.
__q
.
imag
))
def
beamsize
(
self
,
z
=
None
,
wavelength
=
None
,
nr
=
None
,
w0
=
None
):
...
...
pykat/tools/plotting/beamtrace.py
View file @
d612ed3d
...
...
@@ -65,7 +65,7 @@ def plot_beam_trace(_kat, from_node, to_node):
for
n
in
range
(
len
(
spaces
)):
s
=
spaces
[
n
]
Lmax
=
s
.
L
N
=
100
0
N
=
100
node
=
None
cmds
=
"""
...
...
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