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
Sean Leavey
pykat
Commits
2872fa34
Commit
2872fa34
authored
Feb 13, 2014
by
Andreas Freise
Browse files
fixing error regarding alternative beam use for node*
parent
ad7ef75a
Changes
1
Hide whitespace changes
Inline
Side-by-side
pykat/detectors.py
View file @
2872fa34
...
...
@@ -27,11 +27,11 @@ class Detector(object) :
self
.
_params
=
[]
self
.
_mask
=
{}
self
.
__scale
=
None
if
node
.
find
(
'*'
)
:
if
node
[
-
1
]
==
'*'
:
self
.
_alternate_beam
=
True
node
.
replace
(
'*'
,
''
)
node
=
node
[:
-
1
]
self
.
__requested_node
=
node
def
_register_param
(
self
,
param
):
...
...
@@ -87,7 +87,6 @@ class ad(Detector):
Detector
.
__init__
(
self
,
name
,
node_name
)
self
.
mode
=
mode
self
.
alternate_beam
=
alternate_beam
self
.
__f
=
Param
(
"f"
,
self
,
frequency
)
@
property
...
...
@@ -108,16 +107,13 @@ class ad(Detector):
@
staticmethod
def
parseFinesseText
(
text
):
values
=
text
.
split
()
if
values
[
-
1
].
endswith
(
'*'
):
altbeam
=
True
else
:
altbeam
=
False
node
=
values
[
-
1
]
alt_beam
=
node
[
-
1
]
==
'*'
if
len
(
values
)
==
6
:
return
ad
(
values
[
1
],
values
[
4
],
values
[
5
],
mode
=
[
int
(
values
[
2
]),
int
(
values
[
3
])],
alternate_beam
=
alt_beam
)
elif
len
(
values
)
==
4
:
return
ad
(
values
[
1
],
values
[
2
],
values
[
3
],
alternate_beam
=
altbeam
)
return
ad
(
values
[
1
],
values
[
2
],
values
[
3
],
alternate_beam
=
alt
_
beam
)
else
:
raise
pkex
.
BasePyKatException
(
'Amplitude detector code "{0}" is not a valid FINESSE command'
.
format
(
text
))
...
...
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