Commit eab993bf authored by Daniel Brown's avatar Daniel Brown

Merge branch 'master' into 'master'

Transfer function bugix and minor AdV class updates

See merge request finesse/pykat!7
parents 757edaa8 3036275b
......@@ -469,7 +469,7 @@ class tf(Command):
rtn += "p {f} {Q} ".format(f=p.f, Q=p.Q)
for z in self.zeros:
rtn += "p {f} {Q} ".format(f=z.f, Q=z.Q)
rtn += "z {f} {Q} ".format(f=z.f, Q=z.Q)
return rtn
......
......@@ -981,11 +981,15 @@ class ADV_IFO(IFO):
sigs.append(kat1.IFO.POW_BS.add_signal())
sigs.append(kat1.IFO.POW_X.add_signal())
sigs.append(kat1.IFO.POW_Y.add_signal())
if kat1.IFO.isSRC:
sigs.append(kat1.IFO.B1p.add_signal())
nsigs = len(sigs)
kat1.parse('noxaxis\nyaxis abs')
run = True
P_old = np.zeros([2,3], dtype=float) + 1e-9
P = np.zeros(3, dtype=float) + 1e-9
rdiff = np.ones([2,3],dtype=float)
P_old = np.zeros([2, nsigs], dtype=float) + 1e-9
P = np.zeros(nsigs, dtype=float) + 1e-9
rdiff = np.ones([2, nsigs], dtype=float)
mxtm = 0
while run and mxtm <= stop:
vprint(verbose, mxtm, ": ")
......@@ -1350,6 +1354,7 @@ def make_kat(name="avirgo_PR_OMC", katfile=None, verbose = False, debug=False, k
# Useful signals
kat.IFO.B1 = Output(kat.IFO, "B1", "nB1")
kat.IFO.B1p = Output(kat.IFO, "B1p", "nSR2")
kat.IFO.B2_f1 = Output(kat.IFO, "B2_f1", "nB2", "f1", phase = 174.75)
kat.IFO.B2_f2 = Output(kat.IFO, "B2_f2", "nB2", "f2", phase = 49.94)
......@@ -1371,7 +1376,7 @@ def make_kat(name="avirgo_PR_OMC", katfile=None, verbose = False, debug=False, k
kat.IFO.preARMN = DOF(kat.IFO, "ARMN", kat.IFO.POW_X, "", mirrors["EX"], 1, 1.0, sigtype="z")
kat.IFO.preARMW = DOF(kat.IFO, "ARMW", kat.IFO.POW_Y, "", mirrors["EY"], 1, 1.0, sigtype="z")
kat.IFO.preMICH = DOF(kat.IFO, "MICH" , kat.IFO.B1, "", [mirrors["IX"], mirrors["EX"], mirrors["IY"], mirrors["EY"]],
[-0.5,-0.5,0.5,0.5], 6.0, sigtype="z")
[-1,-1,1,1], 6.0, sigtype="z")
kat.IFO.prePRCL = DOF(kat.IFO, "PRCL", kat.IFO.POW_BS, "", mirrors["PRM"], 1, 10.0, sigtype="z")
kat.IFO.preDARM = DOF(kat.IFO, "DARM", kat.IFO.POW_X, "", [mirrors["EX"], mirrors["EY"]], [-1,1], 1.0, sigtype="z")
kat.IFO.preCARM = DOF(kat.IFO, "CARM", kat.IFO.POW_X, "", [mirrors["EX"], mirrors["EY"]], [-1,-1], 1.0, sigtype="z")
......@@ -1381,7 +1386,7 @@ def make_kat(name="avirgo_PR_OMC", katfile=None, verbose = False, debug=False, k
# Science mode control scheme obtained from Valeria Sequino.
kat.IFO.PRCL = DOF(kat.IFO, "PRCL", kat.IFO.B2_f3, "I", mirrors["PRM"], 1, 100.0, sigtype="z")
kat.IFO.MICH = DOF(kat.IFO, "MICH", kat.IFO.B4_f2, "Q", [mirrors["IX"], mirrors["EX"], mirrors["IY"], mirrors["EY"]],
[-0.5,-0.5,0.5,0.5], 100.0, sigtype="z")
[-1,-1,1,1], 100.0, sigtype="z")
kat.IFO.CARM = DOF(kat.IFO, "CARM", kat.IFO.B4_f2, "I", [mirrors["EX"], mirrors["EY"]], [-1, -1], 1.5, sigtype="z")
kat.IFO.DARM = DOF(kat.IFO, "DARM", kat.IFO.B1, "", [mirrors["EX"], mirrors["EY"]], [-1,1], 1.0, sigtype="z")
if isSRC:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment