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

some code refactoring, making block names more consistent

parent 665695c0
No related branches found
No related tags found
No related merge requests found
Pipeline #
Show whitespace changes
Inline Side-by-side
pykat/gw_detectors/finesse_files/aLIGO.kat
+ 12
− 15
View file @ 6021918e
...@@ -13,9 +13,7 @@ ...@@ -13,9 +13,7 @@
# #
# Anna Green, 28th November 2016 # Anna Green, 28th November 2016
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
#
%%% FTblock References
###########################################################################
# References used for aLIGO parameters # References used for aLIGO parameters
# [1] R. Abbott. Advanced LIGO length sensing and control final design. LIGO Document T1000298, 2010. # [1] R. Abbott. Advanced LIGO length sensing and control final design. LIGO Document T1000298, 2010.
# [2] Advanced LIGO, CQG, 2015 # [2] Advanced LIGO, CQG, 2015
...@@ -61,10 +59,8 @@ ...@@ -61,10 +59,8 @@
# #
# #
###########################################################################
%%% FTend References
%%% FTblock Laser %%% FTblock laser
########################################################################### ###########################################################################
# Laser and input optics # Laser and input optics
l L0 125 0 n0 l L0 125 0 n0
...@@ -80,7 +76,7 @@ s lmod2 1 n2 n3 ...@@ -80,7 +76,7 @@ s lmod2 1 n2 n3
mod mod2 $f2 0.18 1 pm n3 n4 mod mod2 $f2 0.18 1 pm n3 n4
s lmod3 1 n4 nREFL # TODO s lmod3 1 n4 nREFL # TODO
########################################################################### ###########################################################################
%%% FTend Laser %%% FTend laser
%%% FTblock PRC %%% FTblock PRC
########################################################################### ###########################################################################
...@@ -230,7 +226,7 @@ m2 SRMAR 0 50n 0 nSRMs2 nSRM2 ...@@ -230,7 +226,7 @@ m2 SRMAR 0 50n 0 nSRMs2 nSRM2
attr SRM Rc -5.6938 attr SRM Rc -5.6938
########################################################################### ###########################################################################
%%% FTend SR %%% FTend SRC
%%% FTblock HOMs %%% FTblock HOMs
########################################################################### ###########################################################################
...@@ -247,7 +243,7 @@ cav cavSRY SRM nSRM1 ITMY nITMYs2 ...@@ -247,7 +243,7 @@ cav cavSRY SRM nSRM1 ITMY nITMYs2
########################################################################### ###########################################################################
%%% FTend HOMs %%% FTend HOMs
%%% FTblock Constants %%% FTblock constants
########################################################################### ###########################################################################
const nsilica 1.44963098985906 const nsilica 1.44963098985906
const nTGG 1.954 const nTGG 1.954
...@@ -258,9 +254,9 @@ const fM 36.397884M ...@@ -258,9 +254,9 @@ const fM 36.397884M
const fP 54.596826M const fP 54.596826M
const th_f 34.5k const th_f 34.5k
########################################################################### ###########################################################################
%%% FTend Constants %%% FTend constants
%%% FTblock Tunings %%% FTblock tunings
########################################################################### ###########################################################################
const phi_SRM 90.0 const phi_SRM 90.0
const phi_PRM 0.0 const phi_PRM 0.0
...@@ -270,11 +266,11 @@ const phi_ETMX 0.0 ...@@ -270,11 +266,11 @@ const phi_ETMX 0.0
const phi_ETMY 0.0 const phi_ETMY 0.0
const phi_BS 0 const phi_BS 0
########################################################################### ###########################################################################
%%% FTend Tunings %%% FTend tunings
# reintroduced: errsigs, locks, powers (partial) # reintroduced: errsigs, locks, powers (partial)
%%% FTblock Powers %%% FTblock powers
########################################################################### ###########################################################################
pd P_DC_AS nSRM2 pd P_DC_AS nSRM2
# pd P_DC_OMC nOMC_HROC_trans # pd P_DC_OMC nOMC_HROC_trans
...@@ -295,7 +291,7 @@ ad src0 0 nSRM1* ...@@ -295,7 +291,7 @@ ad src0 0 nSRM1*
ad srcf1 $f1 nSRM1* ad srcf1 $f1 nSRM1*
ad srcf2 $f2 nSRM1* ad srcf2 $f2 nSRM1*
########################################################################### ###########################################################################
%%% FTend Powers %%% FTend powers
%%% FTblock errsigs %%% FTblock errsigs
########################################################################### ###########################################################################
...@@ -320,6 +316,7 @@ pd1 AS_f2_Q $f2 103 nSRM2 ...@@ -320,6 +316,7 @@ pd1 AS_f2_Q $f2 103 nSRM2
%%% FTblock locks %%% FTblock locks
########################################################################### ###########################################################################
/*
set PRCL_err POP_f1_I re set PRCL_err POP_f1_I re
set MICH_err POP_f2_Q re set MICH_err POP_f2_Q re
set CARM_err REFL_f1_I re set CARM_err REFL_f1_I re
...@@ -362,7 +359,7 @@ noplot CARM_lock ...@@ -362,7 +359,7 @@ noplot CARM_lock
noplot mMICH_lock noplot mMICH_lock
noplot ETMX_lock noplot ETMX_lock
noplot ETMY_lock noplot ETMY_lock
*/
########################################################################### ###########################################################################
%%% FTend locks %%% FTend locks
......
pykat/gw_detectors/ifo.py
+ 100
− 62
View file @ 6021918e
...@@ -481,33 +481,60 @@ class aLIGO(object): ...@@ -481,33 +481,60 @@ class aLIGO(object):
self.DCoffsetW = AS_power self.DCoffsetW = AS_power
return self.DCoffset return self.DCoffset
def generate_tuning_block(self, kat):
code1 = """
%%% FTblock tunings
###########################################################################"""
code2 = """
const phi_ITMX {:.8}
const phi_ITMY {:.8}
const phi_ETMX {:.8}
const phi_ETMY {:.8}""".format(float(kat.ITMX.phi), float(kat.ITMY.phi), float(kat.ETMX.phi),float(kat.ETMY.phi))
code3 = """
const phi_BS {:.8}
const phi_PRM {:.8}
const phi_SRM {:.8}""".format(float(kat.BS.phi), float(kat.PRM.phi), float(kat.SRM.phi))
code4 = """
###########################################################################
%%% FTend tuning"""
return "".join([code1, code2, code3, code4])
def generate_errsig_block(self, kat, noplot=False): def generate_errsig_block(self, kat, noplot=False):
code1 = """
%%% FTblock errsigs
###########################################################################
"""
sigDARM = self.DARM.signal(kat) sigDARM = self.DARM.signal(kat)
sigCARM = self.CARM.signal(kat) sigCARM = self.CARM.signal(kat)
sigPRCL = self.PRCL.signal(kat) sigPRCL = self.PRCL.signal(kat)
sigMICH = self.MICH.signal(kat) sigMICH = self.MICH.signal(kat)
sigSRCL = self.SRCL.signal(kat) sigSRCL = self.SRCL.signal(kat)
code1 = "\n".join([sigDARM, sigCARM, sigPRCL, sigMICH, sigSRCL]) code2 = "\n".join([sigDARM, sigCARM, sigPRCL, sigMICH, sigSRCL])
code3= ""
if noplot: if noplot:
nameDARM = self.DARM.signal_name(kat) nameDARM = self.DARM.signal_name(kat)
nameCARM = self.CARM.signal_name(kat) nameCARM = self.CARM.signal_name(kat)
namePRCL = self.PRCL.signal_name(kat) namePRCL = self.PRCL.signal_name(kat)
nameMICH = self.MICH.signal_name(kat) nameMICH = self.MICH.signal_name(kat)
nameSRCL = self.SRCL.signal_name(kat) nameSRCL = self.SRCL.signal_name(kat)
code2 = """ code3 = """
noplot {}
noplot {} noplot {}
noplot {} noplot {}
noplot {} noplot {}
noplot {} noplot {}
""".format(nameDARM, nameCARM, namePRCL, nameMICH, nameSRCL) noplot {}""".format(nameDARM, nameCARM, namePRCL, nameMICH, nameSRCL)
return "".join([code1, code2])
else: code4 = """
return code1 ###########################################################################
%%% FTend errsigs"""
return "".join([code1, code2, code3, code4])
def generate_lock_block(self, _kat, gainsAdjustment = [0.5, 0.005, 1.0, 0.5, 0.025], gains=None, accuracies=None, verbose=True):
def generate_locks(self, _kat, gainsAdjustment = [0.5, 0.005, 1.0, 0.5, 0.025], gains=None, accuracies=None, verbose=True):
""" """
gainsAdjustment: factors to apply to loop gains computed from optical gains gainsAdjustment: factors to apply to loop gains computed from optical gains
gains: override loop gain [W per deg] gains: override loop gain [W per deg]
...@@ -530,6 +557,7 @@ class aLIGO(object): ...@@ -530,6 +557,7 @@ class aLIGO(object):
gainMICH = round_to_n(gainsAdjustment[3] * factor / ogMICH, 2) # manually tuned gainMICH = round_to_n(gainsAdjustment[3] * factor / ogMICH, 2) # manually tuned
gainSRCL = round_to_n(gainsAdjustment[4] * factor / ogSRCL, 2) # gain hirarchy with MICH gainSRCL = round_to_n(gainsAdjustment[4] * factor / ogSRCL, 2) # gain hirarchy with MICH
gains = [ gainDARM, gainCARM, gainPRCL, gainMICH, gainSRCL] gains = [ gainDARM, gainCARM, gainPRCL, gainMICH, gainSRCL]
self.lockGains = gains.copy()
# rms: loop accuracies in meters (manually tuned for the loops to work # rms: loop accuracies in meters (manually tuned for the loops to work
# with the default file) # with the default file)
...@@ -545,12 +573,51 @@ class aLIGO(object): ...@@ -545,12 +573,51 @@ class aLIGO(object):
accMICH = round_to_n(np.abs(factor * rms[3] * ogMICH),2) accMICH = round_to_n(np.abs(factor * rms[3] * ogMICH),2)
accSRCL = round_to_n(np.abs(factor * rms[4] * ogSRCL),2) accSRCL = round_to_n(np.abs(factor * rms[4] * ogSRCL),2)
accuracies = [accDARM, accCARM, accPRCL, accMICH, accSRCL] accuracies = [accDARM, accCARM, accPRCL, accMICH, accSRCL]
self.lockAccuracies = accuracies.copy()
nameDARM = self.DARM.signal_name(kat) nameDARM = self.DARM.signal_name(kat)
nameCARM = self.CARM.signal_name(kat) nameCARM = self.CARM.signal_name(kat)
namePRCL = self.PRCL.signal_name(kat) namePRCL = self.PRCL.signal_name(kat)
nameMICH = self.MICH.signal_name(kat) nameMICH = self.MICH.signal_name(kat)
nameSRCL = self.SRCL.signal_name(kat) nameSRCL = self.SRCL.signal_name(kat)
self.lockNames = [nameDARM, nameCARM, namePRCL, nameMICH, nameSRCL]
factor1 = 2.0 * math.pi / 360.0
factor2 = 2.0 * math.pi / kat.lambda0
factor3 = 360.0 / kat.lambda0
factor4 = -1.0 * 180 / math.pi
if verbose:
print(" .--------------------------------------------------.")
print(" | Parameters for locks: |")
print(" +--------------------------------------------------+")
print(" | -- optical gains [W/rad], [W/deg] and [W/m]: |")
print(" | DARM: {:12.5}, {:12.5}, {:12.5} |".format(ogDARM, ogDARM*factor1, ogDARM*factor2))
print(" | CARM: {:12.5}, {:12.5}, {:12.5} |".format(ogCARM, ogCARM*factor1, ogCARM*factor2))
print(" | PRCL: {:12.5}, {:12.5}, {:12.5} |".format(ogPRCL, ogPRCL*factor1, ogPRCL*factor2))
print(" | MICH: {:12.5}, {:12.5}, {:12.5} |".format(ogMICH, ogMICH*factor1, ogMICH*factor2))
print(" | SRCL: {:12.5}, {:12.5}, {:12.5} |".format(ogSRCL, ogSRCL*factor1, ogSRCL*factor2))
print(" +--------------------------------------------------+")
print(" | -- defult loop accuracies [deg], [m] and [W]: |")
print(" | DARM: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[0], rms[0], np.abs(rms[0]*ogDARM*factor2)))
print(" | CARM: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[1], rms[1], np.abs(rms[1]*ogCARM*factor2)))
print(" | PRCL: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[2], rms[2], np.abs(rms[2]*ogPRCL*factor2)))
print(" | MICH: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[3], rms[3], np.abs(rms[3]*ogMICH*factor2)))
print(" | SRCL: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[4], rms[4], np.abs(rms[4]*ogSRCL*factor2)))
print(" +--------------------------------------------------+")
print(" | -- extra gain factors (factor * 1/optical_gain): |")
print(" | DARM: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[0],factor4/ogDARM, gainsAdjustment[0]*factor4/ogDARM))
print(" | CARM: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[1],factor4/ogCARM, gainsAdjustment[1]*factor4/ogCARM))
print(" | PRCL: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[2],factor4/ogPRCL, gainsAdjustment[2]*factor4/ogPRCL))
print(" | MICH: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[3],factor4/ogMICH, gainsAdjustment[3]*factor4/ogMICH))
print(" | SRCL: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[4],factor4/ogSRCL, gainsAdjustment[4]*factor4/ogSRCL))
print(" `--------------------------------------------------'")
def generate_lock_block(self, kat, verbose=False):
if self.lockNames == None or self.lockAccuracies == None or self.lockGains == None:
raise pkex.BasePyKatException("run gerate_locks before generate_lock_block")
code1 = """ code1 = """
%%% FTblock locks %%% FTblock locks
########################################################################### ###########################################################################
...@@ -560,13 +627,14 @@ class aLIGO(object): ...@@ -560,13 +627,14 @@ class aLIGO(object):
set MICH_err {} re set MICH_err {} re
set SRCL_err {} re set SRCL_err {} re
func DARM_err = $AS_f2_I_re - {} func DARM_err = $AS_f2_I_re - {}
""".format(nameDARM, nameCARM, namePRCL, nameMICH, nameSRCL, self.DCoffsetW) """.format(self.lockNames[0], self.lockNames[1], self.lockNames[2], self.lockNames[3], self.lockNames[4], self.DCoffsetW)
code2 = """lock DARM_lock $DARM_err {:8.2} {:8.2} code2 = """
lock DARM_lock $DARM_err {:8.2} {:8.2}
lock CARM_lock $CARM_err {:8.2g} {:8.2g} lock CARM_lock $CARM_err {:8.2g} {:8.2g}
lock PRCL_lock $PRCL_err {:8.2g} {:8.2g} lock PRCL_lock $PRCL_err {:8.2g} {:8.2g}
lock MICH_lock $MICH_err {:8.2g} {:8.2g} lock MICH_lock $MICH_err {:8.2g} {:8.2g}
lock SRCL_lock $SRCL_err {:8.2g} {:8.2g}""".format(gains[0], accuracies[0], gains[1], accuracies[1], gains[2], accuracies[2], gains[3], accuracies[3], gains[4], accuracies[4]) lock SRCL_lock $SRCL_err {:8.2g} {:8.2g}""".format(self.lockGains[0], self.lockAccuracies[0], self.lockGains[1], self.lockAccuracies[1], self.lockGains[2], self.lockAccuracies[2], self.lockGains[3], self.lockAccuracies[3], self.lockGains[4], self.lockAccuracies[4])
code3 = """ code3 = """
noplot ITMY_lock noplot ITMY_lock
...@@ -588,45 +656,15 @@ lock SRCL_lock $SRCL_err {:8.2g} {:8.2g}""".format(gains[0], accuracies[0], gain ...@@ -588,45 +656,15 @@ lock SRCL_lock $SRCL_err {:8.2g} {:8.2g}""".format(gains[0], accuracies[0], gain
noplot CARM_lock noplot CARM_lock
noplot ETMX_lock noplot ETMX_lock
noplot ETMY_lock noplot ETMY_lock
########################################################################### ###########################################################################
%%% FTend locks %%% FTend locks"""
"""
factor1 = 2.0 * math.pi / 360.0
factor2 = 2.0 * math.pi / kat.lambda0
factor3 = 360.0 / kat.lambda0
factor4 = -1.0 * 180 / math.pi
if verbose: if verbose:
print(" .--------------------------------------------------.") print(" .--------------------------------------------------.")
print(" | Parameters for locks: |") print(" | Lock commands used: |")
print(" +--------------------------------------------------+") print(" +--------------------------------------------------+")
print(" | -- optical gains [W/rad], [W/deg] and [W/m]: |")
print(" | DARM: {:12.5}, {:12.5}, {:12.5} |".format(ogDARM, ogDARM*factor1, ogDARM*factor2))
print(" | CARM: {:12.5}, {:12.5}, {:12.5} |".format(ogCARM, ogCARM*factor1, ogCARM*factor2))
print(" | PRCL: {:12.5}, {:12.5}, {:12.5} |".format(ogPRCL, ogPRCL*factor1, ogPRCL*factor2))
print(" | MICH: {:12.5}, {:12.5}, {:12.5} |".format(ogMICH, ogMICH*factor1, ogMICH*factor2))
print(" | SRCL: {:12.5}, {:12.5}, {:12.5} |".format(ogSRCL, ogSRCL*factor1, ogSRCL*factor2))
print(" +--------------------------------------------------+")
print(" | -- defult loop accuracies [deg], [m] and [W]: |")
print(" | DARM: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[0], rms[0], np.abs(rms[0]*ogDARM*factor2)))
print(" | CARM: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[1], rms[1], np.abs(rms[1]*ogCARM*factor2)))
print(" | PRCL: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[2], rms[2], np.abs(rms[2]*ogPRCL*factor2)))
print(" | MICH: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[3], rms[3], np.abs(rms[3]*ogMICH*factor2)))
print(" | SRCL: {:12.6}, {:12.6}, {:12.6} |".format(factor3*rms[4], rms[4], np.abs(rms[4]*ogSRCL*factor2)))
print(" +--------------------------------------------------+")
print(" | -- extra gain factors (factor * 1/optical_gain): |")
print(" | DARM: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[0],factor4/ogDARM, gainsAdjustment[0]*factor4/ogDARM))
print(" | CARM: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[1],factor4/ogCARM, gainsAdjustment[1]*factor4/ogCARM))
print(" | PRCL: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[2],factor4/ogPRCL, gainsAdjustment[2]*factor4/ogPRCL))
print(" | MICH: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[3],factor4/ogMICH, gainsAdjustment[3]*factor4/ogMICH))
print(" | SRCL: {:5.4} * {:12.6} = {:12.6} |".format(gainsAdjustment[4],factor4/ogSRCL, gainsAdjustment[4]*factor4/ogSRCL))
print(" +--------------------------------------------------+")
print(" | -- lock commands used: |")
for l in code2.splitlines(): for l in code2.splitlines():
print (" | {:49}|".format(l)) print (" | {:49}|".format(l))
print(" `--------------------------------------------------'") print(" `--------------------------------------------------'")
return "".join([code1, code2, code3]) return "".join([code1, code2, code3])
# --------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

AEI Privacy Policy Imprint