Skip to content
Snippets Groups Projects
Commit 17b2b0f3 authored by Daniel Brown's avatar Daniel Brown
Browse files

adding senstivity variations of noise computations

parent 4350b768
No related branches found
No related tags found
No related merge requests found
...@@ -368,10 +368,6 @@ class qnoised(pd): ...@@ -368,10 +368,6 @@ class qnoised(pd):
def pdtype(self, value): def pdtype(self, value):
raise pkex.BasePyKatException("Setting pdtype is not possible with qnoised detectors") raise pkex.BasePyKatException("Setting pdtype is not possible with qnoised detectors")
@pd.senstype.setter
def senstype(self,value):
raise pkex.BasePyKatException("qnoised detector has no sensitvity type")
def parseAttributes(self, values): def parseAttributes(self, values):
for key in values.keys(): for key in values.keys():
...@@ -416,7 +412,14 @@ class qnoised(pd): ...@@ -416,7 +412,14 @@ class qnoised(pd):
if alt_beam: if alt_beam:
node = node[0:-1] node = node[0:-1]
return qnoised(values[1], demods, node, alternate_beam=alt_beam, **dict) if values[0].endswith('S'):
sens='S'
elif values[0].endswith('N'):
sens='N'
else:
sens=None
return qnoised(values[1], demods, node, senstype=sens, alternate_beam=alt_beam, **dict)
def getFinesseText(self) : def getFinesseText(self) :
rtn = [] rtn = []
...@@ -440,7 +443,7 @@ class qnoised(pd): ...@@ -440,7 +443,7 @@ class qnoised(pd):
if senstype == None: if senstype == None:
senstype = "" senstype = ""
rtn.append("qnoised {0} {1} {2} {3}{4}".format(self.name, self.num_demods, fphi_str, self.node.name, alt_str)) rtn.append("qnoised{5} {0} {1} {2} {3}{4}".format(self.name, self.num_demods, fphi_str, self.node.name, alt_str, senstype))
if self.scale != None: if self.scale != None:
rtn.append("scale {1} {0}".format(self.name, self.scale)) rtn.append("scale {1} {0}".format(self.name, self.scale))
...@@ -499,7 +502,14 @@ class qshot(pd): ...@@ -499,7 +502,14 @@ class qshot(pd):
if alt_beam: if alt_beam:
node = node[0:-1] node = node[0:-1]
return qnoised(values[1], demods, node, alternate_beam=alt_beam, **dict) if values[0].endswith('S'):
sens='S'
elif values[0].endswith('N'):
sens='N'
else:
sens=None
return qshot(values[1], demods, node, senstype=sens, alternate_beam=alt_beam, **dict)
def getFinesseText(self) : def getFinesseText(self) :
rtn = [] rtn = []
...@@ -523,7 +533,7 @@ class qshot(pd): ...@@ -523,7 +533,7 @@ class qshot(pd):
if senstype == None: if senstype == None:
senstype = "" senstype = ""
rtn.append("qshot {0} {1} {2} {3}{4}".format(self.name, self.num_demods, fphi_str, self.node.name, alt_str)) rtn.append("qshot{5} {0} {1} {2} {3}{4}".format(self.name, self.num_demods, fphi_str, self.node.name, alt_str,senstype))
if self.scale != None: if self.scale != None:
rtn.append("scale {1} {0}".format(self.name, self.scale)) rtn.append("scale {1} {0}".format(self.name, self.scale))
......
...@@ -592,9 +592,9 @@ class kat(object): ...@@ -592,9 +592,9 @@ class kat(object):
obj = pykat.detectors.ad.parseFinesseText(line) obj = pykat.detectors.ad.parseFinesseText(line)
elif(first[0:2] == "pd" and first != "pdtype"): elif(first[0:2] == "pd" and first != "pdtype"):
obj = pykat.detectors.pd.parseFinesseText(line) obj = pykat.detectors.pd.parseFinesseText(line)
elif(first == "qshot"): elif(first == "qshot" or first == "qshotS" or first == "qshotN"):
obj = pykat.detectors.qshot.parseFinesseText(line) obj = pykat.detectors.qshot.parseFinesseText(line)
elif(first == "qnoised"): elif(first == "qnoised" or first == "qnoisedS" or first == "qnoisedN"):
obj = pykat.detectors.qnoised.parseFinesseText(line) obj = pykat.detectors.qnoised.parseFinesseText(line)
elif(first == "xaxis" or first == "xaxis*"): elif(first == "xaxis" or first == "xaxis*"):
obj = pykat.commands.xaxis.parseFinesseText(line) obj = pykat.commands.xaxis.parseFinesseText(line)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment