Skip to content
Snippets Groups Projects
Commit 2872fa34 authored by Andreas Freise's avatar Andreas Freise
Browse files

fixing error regarding alternative beam use for node*

parent ad7ef75a
No related branches found
No related tags found
No related merge requests found
...@@ -28,9 +28,9 @@ class Detector(object) : ...@@ -28,9 +28,9 @@ class Detector(object) :
self._mask = {} self._mask = {}
self.__scale = None self.__scale = None
if node.find('*'): if node[-1]=='*':
self._alternate_beam = True self._alternate_beam = True
node.replace('*','') node=node[:-1]
self.__requested_node = node self.__requested_node = node
...@@ -87,7 +87,6 @@ class ad(Detector): ...@@ -87,7 +87,6 @@ class ad(Detector):
Detector.__init__(self, name, node_name) Detector.__init__(self, name, node_name)
self.mode = mode self.mode = mode
self.alternate_beam = alternate_beam self.alternate_beam = alternate_beam
self.__f = Param("f", self, frequency) self.__f = Param("f", self, frequency)
@property @property
...@@ -109,15 +108,12 @@ class ad(Detector): ...@@ -109,15 +108,12 @@ class ad(Detector):
def parseFinesseText(text): def parseFinesseText(text):
values = text.split() values = text.split()
if values[-1].endswith('*'): node=values[-1]
altbeam = True alt_beam = node[-1] == '*'
else:
altbeam = False
if len(values) == 6: if len(values) == 6:
return ad(values[1], values[4], values[5], mode = [int(values[2]), int(values[3])], alternate_beam=alt_beam) return ad(values[1], values[4], values[5], mode = [int(values[2]), int(values[3])], alternate_beam=alt_beam)
elif len(values) == 4: 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: else:
raise pkex.BasePyKatException('Amplitude detector code "{0}" is not a valid FINESSE command'.format(text)) raise pkex.BasePyKatException('Amplitude detector code "{0}" is not a valid FINESSE command'.format(text))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment