From 13873bbd690ddff604e8130bb6138242ff816337 Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 21 Jan 2026 17:11:34 +0100 Subject: [PATCH] Optimizing SF+ matching --- Scripts/Final/SFPlus/initTwiss.madx | 7 +- Scripts/Final/SFPlus/matchAthos.madx | 33 +- Scripts/Final/SFPlus/matchInjector.madx | 38 +- Scripts/Final/SFPlus/settings.json | 528 ++++++++++++------------ 4 files changed, 319 insertions(+), 287 deletions(-) diff --git a/Scripts/Final/SFPlus/initTwiss.madx b/Scripts/Final/SFPlus/initTwiss.madx index 0ecd6b4..232438f 100644 --- a/Scripts/Final/SFPlus/initTwiss.madx +++ b/Scripts/Final/SFPlus/initTwiss.madx @@ -1,13 +1,14 @@ option,-echo; ! starting condition Twiss0: beta0,betx=10,alfx=0,bety=10,alfy=0; ! location:swissfel$start -TwissM1: beta0,betx=8.72,alfx=1,bety=8.72,alfy=1; ! location:sinsb04.mqua230$end +TwissM1: beta0,betx=4.36,alfx=0.5,bety=4.36,alfy=0.5; ! location:sinsb04.mqua230$end TwissM2: beta0, betx = 11.1557, alfx = -1.17, bety = 50, alfy = 0.; ! label: After BC1 location:sindi02.mqua020$start Twisssep: beta0,betx=10,alfx=-0.2,bety=20,alfy=1.0; ! label: Septum location:s20sy02$start TwissAT1: beta0,betx=34.45,alfx=1,bety=34.45,alfy=1; ! label: Switchyard - Drift location:satsy02.mqua230 -TwissAT2: beta0,betx=5,alfx=1.77,bety=4,alfy=-1.04; ! label: Switchyard - Double Bend location:satsy03.mqua110 -TwissAT3: beta0,betx=14,alfx=0.7,bety=14,alfy=0.7; ! label: Beam Stopper location:satcb01.mqua430$end +TwissAT2: beta0,betx=38,alfx=8,bety=1.52,alfy=-0.5; ! label: Switchyard - Double Bend location:satsy03.mqua110 +TwissAT3: beta0,betx=10,alfx=0.5,bety=10,alfy=0.5; ! label: Beam Stopper location:satcb01.mqua430$end twissee: beta0,betx=7,bety=30,alfx=0.5,alfy=1.5; ! label: EEHG location:satma01.mqua250$end +twissAT4: beta0, betx=50,bety=50,alfx=0.0,alfy=0; ! label: Athos XTCAV location: satbd01.mqua010$start twisspor: beta0, betx=3.9036,alfx=-0.05021,bety=37.6374,alfy=4.4433; ! label: Porthos Septum location:s30cb15$end twissARECOL:beta0, betx = 2.304, alfx = -1.4045, bety = 25.929, alfy = -6.363; ! label: Aramis ECOL location:sarma01.mqua010$start ! variables diff --git a/Scripts/Final/SFPlus/matchAthos.madx b/Scripts/Final/SFPlus/matchAthos.madx index 2f4b98b..4306bf6 100644 --- a/Scripts/Final/SFPlus/matchAthos.madx +++ b/Scripts/Final/SFPlus/matchAthos.madx @@ -306,7 +306,7 @@ twiss,SEQUENCE=swissfel,range=satma01.mqua250$end/satun11$end,beta0=twissee; plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100; -scl=4; +scl=7; satcb02.mqua230.k1=scl*0.2; satcb02.mqua430.k1=-scl*0.2; satcb03.mqua230.k1=scl*0.2; @@ -340,6 +340,37 @@ ENDMATCH; twiss,SEQUENCE=swissfel,range=s20sy02$start/satun11$end,beta0=twisssep; plot,haxis=s,vaxis=betx,bety,range=satdi01$start/#e,colour=100; +Print,text='MATCH POINT: Athos XTCAV'; +MATCH, SEQUENCE=swissfel,range=s20sy02$start/satbd01$end,beta0=twisssep; +VARY,NAME=satun26.mqua080.k1,STEP=0.0001,lower=-5.0,upper=5.0; +VARY,NAME=satun25.mqua080.k1,STEP=0.0001,lower=-5.0,upper=5.0; +VARY,NAME=satun24.mqua080.k1,STEP=0.0001,lower=-5.0,upper=5.0; +VARY,NAME=satun23.mqua080.k1,STEP=0.0001,lower=-5.0,upper=5.0; +CONSTRAINT,SEQUENCE=swissfel,range=satbd01.mqua010$start,betx=twissAT4->BETX; +CONSTRAINT,SEQUENCE=swissfel,range=satbd01.mqua010$start,bety=twissAT4->BETY; +CONSTRAINT,SEQUENCE=swissfel,range=satbd01.mqua010$start,alfx=twissAT4->ALFX; +CONSTRAINT,SEQUENCE=swissfel,range=satbd01.mqua010$start,alfy=twissAT4->ALFY; +!CONSTRAINT,SEQUENCE=swissfel,range=satun25.mqua080$start,betx < 80; +!CONSTRAINT,SEQUENCE=swissfel,range=satun25.mqua080$start,bety < 80; +LMDIF,CALLS=1000,TOLERANCE=1.e-21; +ENDMATCH; + + +! fixed values, given by Eduard + +SATBD01.MQUA010.K1= 5.069789237265826e-01; +SATBD01.MQUA030.K1= -6.184665903305938e-01 ; +SATBD01.MQUA050.K1= 1.324854421128419e-01 ; +SATBD01.MQUA070.K1= 4.740280173415730e-01 ; +SATBD01.MQUA090.K1= -7.442648986155268e-01; +SATBD02.MQUA030.K1= -1.050806764409536e+00; + +twiss,SEQUENCE=swissfel,range=s20sy02$start/satbd01$end,beta0=twisssep; +plot,haxis=s,vaxis=betx,bety,range=satdi01$start/#e,colour=100; + + + + twiss,SEQUENCE=swissfel,range=#s/satun26$end,beta0=twiss0; plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100; diff --git a/Scripts/Final/SFPlus/matchInjector.madx b/Scripts/Final/SFPlus/matchInjector.madx index 7281d25..48b721e 100644 --- a/Scripts/Final/SFPlus/matchInjector.madx +++ b/Scripts/Final/SFPlus/matchInjector.madx @@ -3,9 +3,6 @@ -L = 8.72; -alpha = 1; -beta = alpha*L; Print,text='MATCH POINT: Laser Heater'; @@ -22,12 +19,15 @@ CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua230$end, alfx = TwissM1->ALFX; CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua230$end, alfy = TwissM1->ALFY; CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua230$end, betx = TwissM1->BETX; CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua230$end, bety = TwissM1->BETY; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua130$end, betx < 100; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua130$end, bety < 100; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinlh01.mqua070$end, betx < 100; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinlh01.mqua070$end, bety < 100; -LMDIF,CALLS=1000,TOLERANCE=1.e-21; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua130$end, betx < 65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb04.mqua130$end, bety < 65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb03.mqua230$end, betx < 65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb03.mqua230$end, bety < 65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb03.mqua130$end, betx < 65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinsb03.mqua130$end, bety < 65; SIMPLEX,CALLS=1000,TOLERANCE=1.e-21; +LMDIF,CALLS=1000,TOLERANCE=1.e-21; + ENDMATCH; @@ -42,10 +42,10 @@ VARY,NAME=sinbc01.MQUA050.k1,STEP=0.0001; VARY,NAME=sinbc01.MQUA070.k1,STEP=0.0001; VARY,NAME=sinbc01.MQUA090.k1,STEP=0.0001; VARY,NAME=sinbc01.MQUA110.k1,STEP=0.0001; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02$end, betx < 5; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02$end, betx = 3; CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02$end, alfx = 0; CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc01.mqua070$end, bety < 32; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02$end, bety < 59; +CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc02$end, bety = 25; CONSTRAINT,SEQUENCE=SwissFEL,range=sinbc01$end, x = 0; SIMPLEX,CALLS=1000,TOLERANCE=1.e-21; ENDMATCH; @@ -53,7 +53,7 @@ ENDMATCH; twiss,SEQUENCE=swissfel,range=#s/sinbc02$end,beta0 = Twiss0; plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100; -sinma01.mqua020.k1=-0.1; + Print,text='MATCH POINT: Injector-TDS'; MATCH,SEQUENCE=SwissFEL,range=#s/sindi02$end,beta0 = Twiss0; @@ -68,10 +68,10 @@ CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,bety=TwissM2->BETY; CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,alfy=TwissM2->ALFY; CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,betx=TwissM2->BETX; CONSTRAINT,SEQUENCE=SwissFEL,range=sindi02.mqua020$start,alfx=TwissM2->ALFX; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinma01$end, betx < 100; -CONSTRAINT,SEQUENCE=SwissFEL,range=sinma01$end, bety < 100; -CONSTRAINT,SEQUENCE=SwissFEL,range=sincb01$end, betx < 100; -CONSTRAINT,SEQUENCE=SwissFEL,range=sincb01$end, bety < 100; +CONSTRAINT,SEQUENCE=SwissFEL,range=sincb01.mqua230$end, betx <65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sincb01.mqua230$end, bety < 65; +CONSTRAINT,SEQUENCE=SwissFEL,range=sincb01$end, betx < 50; +CONSTRAINT,SEQUENCE=SwissFEL,range=sincb01$end, bety < 50; LMDIF,CALLS=1000,TOLERANCE=1.e-21; SIMPLEX,CALLS=1000,TOLERANCE=1.e-21; ENDMATCH; @@ -81,10 +81,10 @@ twiss,SEQUENCE=swissfel,range=#s/sindi02$end,beta0 = Twiss0; plot,haxis=s,vaxis=betx,bety,range=sinbc02$start/#e,colour=100; -s10cb02.mqua230.k1=0.2; -s10cb02.mqua430.k1=-0.2; +s10cb02.mqua230.k1=-0.2; +s10cb02.mqua430.k1=0.2; -muLin1=0.2; +muLin1=0.13; Print,text='MATCH POINT: FODO - Linac 1'; match,SEQUENCE=swissfel,range=S10cb02$start/s10cb02$end; Vary,name=S10CB02.MQUA230.k1,step=0.0001; @@ -113,7 +113,7 @@ VARY,NAME=sindi02.mqua050.k1,STEP=0.0001,lower=-5.5,upper=5.5; VARY,NAME=sindi02.mqua060.k1,STEP=0.0001,lower=-5.5,upper=5.5; VARY,NAME=sindi02.mqua090.k1,STEP=0.0001,lower=-5.5,upper=5.5; VARY,NAME=s10cb01.mqua230.k1,STEP=0.0001,lower=-5.5,upper=5.5; -VARY,NAME=s10cb01.mqua430.k1,STEP=0.0001,lower=-5.5,upper=5.5; +!VARY,NAME=s10cb01.mqua430.k1,STEP=0.0001,lower=-5.5,upper=5.5; CONSTRAINT,SEQUENCE=swissfel,range=s10cb02$start,betx=nbetx; CONSTRAINT,SEQUENCE=swissfel,range=s10cb02$start,alfx=nalfx; diff --git a/Scripts/Final/SFPlus/settings.json b/Scripts/Final/SFPlus/settings.json index 4a4ad91..6674a82 100644 --- a/Scripts/Final/SFPlus/settings.json +++ b/Scripts/Final/SFPlus/settings.json @@ -17,52 +17,52 @@ "k1L": 0.0 }, "SINLH01.MQUA020": { - "k1": 3.0630745499592242, - "k1L": 0.4594611824938836 + "k1": 1.7288263722029158, + "k1L": 0.2593239558304374 }, "SINLH01.MQUA040": { - "k1": -8.507464056636442, - "k1L": -1.2761196084954662 + "k1": -6.499263938835763, + "k1L": -0.9748895908253644 }, "SINLH01.MQUA070": { - "k1": 4.791423283821648, - "k1L": 0.7187134925732471 + "k1": 3.790862075197024, + "k1L": 0.5686293112795535 }, "SINSB03.MQUA130": { - "k1": -1.7171021396114041, - "k1L": -0.2575653209417106 + "k1": -1.6730679789063199, + "k1L": -0.25096019683594795 }, "SINSB03.MQUA230": { - "k1": 0.8491183321672662, - "k1L": 0.12736774982508992 + "k1": 1.4930250185068175, + "k1L": 0.2239537527760226 }, "SINSB04.MQUA130": { - "k1": 0.8346016263966225, - "k1L": 0.12519024395949338 + "k1": -1.1832071619758808, + "k1L": -0.17748107429638213 }, "SINSB04.MQUA230": { - "k1": -1.51434932077598, - "k1L": -0.22715239811639698 + "k1": 1.0921960556987604, + "k1L": 0.16382940835481405 }, "SINBC01.MQUA020": { - "k1": 4.419207246315162, - "k1L": 0.6628810869472743 + "k1": 5.505380017533694, + "k1L": 0.8258070026300541 }, "SINBC01.MQUA050": { - "k1": -3.135954687596159, - "k1L": -0.47039320313942384 + "k1": -2.516119928697665, + "k1L": -0.37741798930464976 }, "SINBC01.MQUA070": { - "k1": -0.07788517227068023, - "k1L": -0.011682775840602034 + "k1": -0.7505395141625272, + "k1L": -0.11258092712437907 }, "SINBC01.MQUA090": { - "k1": -0.4903669484881288, - "k1L": -0.07355504227321931 + "k1": -1.227238358423819, + "k1L": -0.18408575376357283 }, "SINBC01.MQUA110": { - "k1": 2.104138013838311, - "k1L": 0.3156207020757466 + "k1": 2.4412379288549486, + "k1L": 0.3661856893282423 }, "SINBC02.MQSK110": { "k1": 0.0, @@ -81,192 +81,192 @@ "k1L": 0.0 }, "SINMA01.MQUA020": { - "k1": 0.8729182202830097, - "k1L": 0.13093773304245146 + "k1": -0.9298891790647495, + "k1L": -0.13948337685971243 }, "SINMA01.MQUA030": { - "k1": -2.2664694844032267, - "k1L": -0.339970422660484 + "k1": -0.9536678912282506, + "k1L": -0.14305018368423758 }, "SINMA01.MQUA050": { - "k1": 1.1320126692734664, - "k1L": 0.16980190039101997 + "k1": 2.5450702747982565, + "k1L": 0.38176054121973846 }, "SINCB01.MQUA230": { - "k1": 1.0134942701641647, - "k1L": 0.1520241405246247 + "k1": -1.1674157757778882, + "k1L": -0.17511236636668323 }, "SINCB01.MQUA430": { - "k1": -0.3629782776918991, - "k1L": -0.054446741653784866 + "k1": 1.719688665962314, + "k1L": 0.2579532998943471 }, "SINDI01.MQUA020": { - "k1": 0.8663348502911161, - "k1L": 0.12995022754366742 + "k1": -1.1062936192405468, + "k1L": -0.16594404288608203 }, "SINDI01.MQSK030": { "k1": 0.0, "k1L": 0.0 }, "SINDI01.MQUA070": { - "k1": -1.2055445844680825, - "k1L": -0.18083168767021238 + "k1": 0.2639310415761435, + "k1L": 0.03958965623642152 }, "SINDI02.MQUA020": { - "k1": -2.0854846363861674, - "k1L": -0.3128226954579251 + "k1": -4.069972854461849, + "k1L": -0.6104959281692773 }, "SINDI02.MQUA030": { - "k1": 3.551209426562248, - "k1L": 0.5326814139843371 + "k1": 3.785706720246248, + "k1L": 0.5678560080369373 }, "SINDI02.MQUA050": { - "k1": 0.5410841433587067, - "k1L": 0.081162621503806 + "k1": 1.0838871071673781, + "k1L": 0.16258306607510672 }, "SINDI02.MQUA060": { - "k1": -1.6537032560931169, - "k1L": -0.24805548841396752 + "k1": -2.245747389298598, + "k1L": -0.3368621083947897 }, "SINDI02.MQUA090": { - "k1": -0.1874964148227161, - "k1L": -0.028124462223407413 + "k1": -2.0519644235843906, + "k1L": -0.30779466353765855 }, "S10CB01.MQUA230": { - "k1": 2.345667261338368, - "k1L": 0.35185008920075517 + "k1": 0.251702142049511, + "k1L": 0.037755321307426655 }, "S10CB01.MQUA430": { - "k1": -2.000786976729015, - "k1L": -0.30011804650935225 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB02.MQUA230": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB02.MQUA430": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10DI01.MQUA030": { "k1": 0.0, "k1L": 0.0 }, "S10DI01.MQUA120": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB03.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB03.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB04.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB04.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB05.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB05.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB06.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB06.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB07.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB07.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB08.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB08.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB09.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB09.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB10.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S10CB10.MQUA430": { - "k1": 1.6072894824230268, - "k1L": 0.24109342236345402 + "k1": -1.0776077864229092, + "k1L": -0.1616411679634364 }, "S10CB11.MQUA230": { - "k1": -1.607278371382602, - "k1L": -0.24109175570739028 + "k1": 1.0776003511299803, + "k1L": 0.16164005266949705 }, "S20SY01.MQUA010": { - "k1": -1.0362921254423012, - "k1L": -0.15544381881634517 + "k1": -0.3120671900714031, + "k1L": -0.046810078510710465 }, "S20SY01.MQUA030": { - "k1": 2.0829987159107586, - "k1L": 0.31244980738661376 + "k1": 0.8637025228825739, + "k1L": 0.12955537843238607 }, "S20SY01.MQUA040": { - "k1": -0.36867651536698304, - "k1L": -0.055301477305047454 + "k1": -1.7431751999920877, + "k1L": -0.2614762799988131 }, "S20SY01.MQUA060": { - "k1": -1.385375026039833, - "k1L": -0.20780625390597493 + "k1": 0.9616923276912036, + "k1L": 0.14425384915368053 }, "S20SY02.MQUA070": { - "k1": 1.3091370851055435, - "k1L": 0.1963705627658315 + "k1": 1.3091332285278723, + "k1L": 0.19636998427918084 }, "S20SY02.MQUA100": { - "k1": -1.7376814693559934, - "k1L": -0.260652220403399 + "k1": -1.7376805274712617, + "k1L": -0.2606520791206892 }, "S20SY02.MQUA140": { - "k1": 2.2163495144345142, - "k1L": 0.33245242716517714 + "k1": 2.2163503487616354, + "k1L": 0.3324525523142453 }, "S20SY02.MQUA180": { - "k1": -1.4702173393779039, - "k1L": -0.22053260090668558 + "k1": -1.4702177103759417, + "k1L": -0.22053265655639126 }, "S20BC01.MQUA010": { - "k1": 1.044502695642961, - "k1L": 0.15667540434644414 + "k1": 1.0445265164936446, + "k1L": 0.1566789774740467 }, "S20BC01.MQUA030": { - "k1": -1.697963501329405, - "k1L": -0.2546945251994107 + "k1": -1.6979732016642843, + "k1L": -0.25469598024964263 }, "S20BC01.MQUA060": { - "k1": 1.1995601462413172, - "k1L": 0.1799340219361976 + "k1": 1.199585671213869, + "k1L": 0.17993785068208035 }, "S20BC02.MQSK110": { "k1": 0.0, @@ -285,20 +285,20 @@ "k1L": 0.0 }, "S20MA01.MQUA010": { - "k1": -1.2678722359581351, - "k1L": -0.19018083539372027 + "k1": -1.267988798328531, + "k1L": -0.19019831974927964 }, "S20MA01.MQUA020": { - "k1": 0.744752365646649, - "k1L": 0.11171285484699735 + "k1": 0.7450561219359533, + "k1L": 0.11175841829039299 }, "S20MA01.MQUA040": { - "k1": 0.3692014352147953, - "k1L": 0.05538021528221929 + "k1": 0.369090377839784, + "k1L": 0.055363556675967596 }, "S20CB01.MQUA430": { - "k1": 0.6538171553349945, - "k1L": 0.09807257330024917 + "k1": 0.6537925876688342, + "k1L": 0.09806888815032512 }, "S20CB02.MQUA430": { "k1": -0.8644569537135267, @@ -313,20 +313,20 @@ "k1L": -0.129668543057029 }, "S30CB01.MQUA430": { - "k1": 0.7708235732636789, - "k1L": 0.11562353598955183 + "k1": 0.770823460169252, + "k1L": 0.11562351902538778 }, "S30CB02.MQUA430": { - "k1": -0.7565802388898138, - "k1L": -0.11348703583347207 + "k1": -0.7565825592447958, + "k1L": -0.11348738388671936 }, "S30CB03.MQUA430": { - "k1": 0.7819370910366137, - "k1L": 0.11729056365549205 + "k1": 0.7819375594909114, + "k1L": 0.1172906339236367 }, "S30CB04.MQUA430": { - "k1": -0.7868877586692742, - "k1L": -0.11803316380039112 + "k1": -0.7868904159213893, + "k1L": -0.11803356238820839 }, "S30CB05.MQUA430": { "k1": 0.8644593288863439, @@ -361,20 +361,20 @@ "k1L": -0.129668543057029 }, "S30CB13.MQUA430": { - "k1": 0.49278156093209324, - "k1L": 0.07391723413981398 + "k1": 0.4927815609322036, + "k1L": 0.07391723413983053 }, "S30CB14.MQUA430": { - "k1": -0.9114515987200055, - "k1L": -0.2734354796160016 + "k1": -0.9114515987198208, + "k1L": -0.2734354796159462 }, "S30CB15.MQUA010": { - "k1": 0.9957698355131872, - "k1L": 0.29873095065395616 + "k1": 0.9957698355122915, + "k1L": 0.29873095065368743 }, "S30CB15.MQUA020": { - "k1": 0.12709720903915625, - "k1L": 0.03812916271174687 + "k1": 0.12709720903976995, + "k1L": 0.03812916271193099 }, "S30CB15.MQUA100": { "k1": -0.20725616868530122, @@ -385,28 +385,28 @@ "k1L": -0.1554421265139759 }, "SARCL01.MQUA020": { - "k1": 0.9998, - "k1L": 0.29994 + "k1": 0.7748273960963027, + "k1L": 0.2324482188288908 }, "SARCL01.MQUA050": { - "k1": -1.2107253038406252, - "k1L": -0.36321759115218755 + "k1": 0.058382322481976105, + "k1L": 0.01751469674459283 }, "SARCL01.MQUA080": { - "k1": -0.3891657773108382, - "k1L": -0.11674973319325145 + "k1": -0.7195571260272149, + "k1L": -0.21586713780816447 }, "SARCL01.MQUA100": { - "k1": 0.2267236339580691, - "k1L": 0.06801709018742073 + "k1": -0.4486633839392915, + "k1L": -0.13459901518178743 }, "SARCL01.MQUA140": { - "k1": 1.4155172658216668, - "k1L": 0.4246551797465 + "k1": 2.5735503703015925, + "k1L": 0.7720651110904777 }, "SARCL01.MQUA190": { - "k1": -1.7573277527034685, - "k1L": -0.5271983258110405 + "k1": -1.6813184936657637, + "k1L": -0.5043955480997291 }, "SARCL02.MQUA130": { "k1": 2.470468387349568, @@ -453,24 +453,24 @@ "k1L": 0.7411405162048703 }, "SARMA01.MQUA010": { - "k1": -1.6381030070801237, - "k1L": -0.49143090212403706 + "k1": -1.8686665737807022, + "k1L": -0.5605999721342106 }, "SARMA01.MQUA060": { - "k1": 1.2378258888742435, - "k1L": 0.37134776666227304 + "k1": 1.6874945170265696, + "k1L": 0.5062483551079708 }, "SARMA01.MQUA080": { - "k1": -0.5995718178413254, - "k1L": -0.1798715453523976 + "k1": -1.0078423513733652, + "k1L": -0.30235270541200954 }, "SARMA01.MQUA120": { - "k1": 0.7584924599237711, - "k1L": 0.22754773797713132 + "k1": 0.14167814802634143, + "k1L": 0.04250344440790243 }, "SARMA01.MQUA140": { - "k1": -0.8783802039628269, - "k1L": -0.26351406118884807 + "k1": -0.6623168952671074, + "k1L": -0.1986950685801322 }, "SARMA02.MQUA050": { "k1": 0.0, @@ -569,20 +569,20 @@ "k1L": -0.16799985830701 }, "SATSY01.MQUA020": { - "k1": 1.4371190856638347, - "k1L": 0.43113572569915043 + "k1": 1.437119085663829, + "k1L": 0.43113572569914865 }, "SATSY01.MQSK040": { "k1": 0, "k1L": 0.0 }, "SATSY01.MQUA050": { - "k1": -1.9995013975352662, - "k1L": -0.5998504192605798 + "k1": -1.999501397534354, + "k1L": -0.5998504192603062 }, "SATSY01.MQUA080": { - "k1": 2.7604341735453963, - "k1L": 0.8281302520636189 + "k1": 2.7604341735454136, + "k1L": 0.8281302520636241 }, "SATSY01.MQSK100": { "k1": 0, @@ -593,72 +593,72 @@ "k1L": -0.105 }, "SATSY02.MQUA010": { - "k1": -0.9701509326838342, - "k1L": -0.29104527980515027 + "k1": -0.9701509326838468, + "k1L": -0.29104527980515404 }, "SATSY02.MQUA210": { - "k1": 2.1405200115543006, - "k1L": 0.6421560034662902 + "k1": 2.14051902474755, + "k1L": 0.642155707424265 }, "SATSY02.MQUA230": { - "k1": -2.1616601178836694, - "k1L": -0.3242490176825504 + "k1": -2.1616563443783656, + "k1L": -0.3242484516567548 }, "SATSY02.MQUA240": { - "k1": -1.1253513153285655, - "k1L": -0.16880269729928482 + "k1": -1.1253553144663022, + "k1L": -0.16880329716994533 }, "SATSY02.MQUA260": { - "k1": 2.16543927403417, - "k1L": 0.3248158911051255 + "k1": 2.165440913234373, + "k1L": 0.32481613698515593 }, "SATSY02.MQUA300": { - "k1": -1.0864672382220935, - "k1L": -0.162970085733314 + "k1": -0.5031167931662779, + "k1L": -0.07546751897494168 }, "SATSY02.MQUA310": { - "k1": 1.970046068490151, - "k1L": 0.29550691027352266 + "k1": -0.44456406476530397, + "k1L": -0.06668460971479559 }, "SATSY02.MQUA330": { - "k1": -1.1325377391415654, - "k1L": -0.1698806608712348 + "k1": 2.4122353338550924, + "k1L": 0.36183530007826387 }, "SATSY02.MQUA340": { - "k1": -0.23906341559125127, - "k1L": -0.03585951233868769 + "k1": -2.0755906194526124, + "k1L": -0.31133859291789184 }, "SATSY03.MQUA120": { - "k1": 1.7543722692978496, - "k1L": 0.5263116807893549 + "k1": 1.7543720093679946, + "k1L": 0.5263116028103983 }, "SATSY03.MQUA220": { - "k1": -1.806009, - "k1L": -0.27090135 + "k1": -1.716719, + "k1L": -0.25750785 }, "SATSY03.MQUA310": { - "k1": 0.809937, - "k1L": 0.12149055 + "k1": -0.319165, + "k1L": -0.047874749999999994 }, "SATSY03.MQUA430": { - "k1": 0.84454, - "k1L": 0.126681 + "k1": 1.512107, + "k1L": 0.22681605 }, "SATBC01.MQUA410": { - "k1": -1.3147131133825611, - "k1L": -0.19720696700738416 + "k1": -0.9015557813832992, + "k1L": -0.13523336720749488 }, "SATBC01.MQUA430": { - "k1": 0.006238981941540245, - "k1L": 0.0009358472912310368 + "k1": -0.910159, + "k1L": -0.13652385 }, "SATBC01.MQUA450": { - "k1": 2.332698766692624, - "k1L": 0.34990481500389364 + "k1": 3.137194, + "k1L": 0.4705791 }, "SATBC01.MQUA470": { - "k1": -0.13107238057309598, - "k1L": -0.019660857085964396 + "k1": -0.2692958949371448, + "k1L": -0.040394384240571714 }, "SATCL01.MQUA120": { "k1": -1.542210514950114, @@ -681,72 +681,72 @@ "k1L": -0.23133157724251707 }, "SATDI01.MQUA025": { - "k1": 0.2054255405, - "k1L": 0.030813831075 + "k1": 0.268536, + "k1L": 0.0402804 }, "SATDI01.MQUA080": { - "k1": 1.4792690094855965, - "k1L": 0.22189035142283947 + "k1": 1.5309658558054233, + "k1L": 0.2296448783708135 }, "SATDI01.MQUA220": { - "k1": -0.8452867912581581, - "k1L": -0.1267930186887237 + "k1": -0.9645400410303776, + "k1L": -0.14468100615455665 }, "SATDI01.MQUA230": { - "k1": -0.9576310590841355, - "k1L": -0.14364465886262032 + "k1": -1.1029506254088872, + "k1L": -0.16544259381133308 }, "SATDI01.MQUA250": { - "k1": 0.7872464754033613, - "k1L": 0.11808697131050419 + "k1": 1.2835779441431538, + "k1L": 0.19253669162147308 }, "SATCB01.MQUA230": { - "k1": 0.7943387767638879, - "k1L": 0.11915081651458317 + "k1": 0.43933676135490896, + "k1L": 0.06590051420323634 }, "SATCB01.MQUA430": { - "k1": -0.4851304279213487, - "k1L": -0.0727695641882023 + "k1": -0.29210416312996473, + "k1L": -0.04381562446949471 }, "SATCB02.MQUA230": { - "k1": 0.8, - "k1L": 0.12 + "k1": 1.4000000000000001, + "k1L": 0.21000000000000002 }, "SATCB02.MQUA430": { - "k1": -0.8, - "k1L": -0.12 + "k1": -1.4000000000000001, + "k1L": -0.21000000000000002 }, "SATCB03.MQUA230": { - "k1": 0.8, - "k1L": 0.12 + "k1": 1.4000000000000001, + "k1L": 0.21000000000000002 }, "SATCB03.MQUA430": { - "k1": -0.7635919776436745, - "k1L": -0.11453879664655117 + "k1": -1.3904673007054442, + "k1L": -0.20857009510581662 }, "SATMA01.MQUA120": { - "k1": 2.124960444310536, - "k1L": 0.16999683554484288 + "k1": 1.0217108280859888, + "k1L": 0.0817368662468791 }, "SATMA01.MQUA140": { - "k1": -1.7790585704650148, - "k1L": -0.1423246856372012 + "k1": 1.5375008300603836, + "k1L": 0.12300006640483069 }, "SATMA01.MQUA160": { - "k1": 1.0566177140332431, - "k1L": 0.08452941712265945 + "k1": -1.6587381948389803, + "k1L": -0.13269905558711842 }, "SATMA01.MQUA180": { - "k1": 0.9580909665878298, - "k1L": 0.07664727732702638 + "k1": -1.8054824038475894, + "k1L": -0.14443859230780715 }, "SATMA01.MQUA230": { - "k1": -1.955315919883341, - "k1L": -0.15642527359066727 + "k1": -0.3947290780776635, + "k1L": -0.03157832624621308 }, "SATMA01.MQUA250": { - "k1": 0.36229832104292164, - "k1L": 0.02898386568343373 + "k1": 2.413482199635587, + "k1L": 0.19307857597084696 }, "SATMA01.MQUA610": { "k1": -1.2185071403550352, @@ -837,40 +837,40 @@ "k1L": 0.32640333814336475 }, "SATUN23.MQUA080": { - "k1": -4.059422833505335, - "k1L": -0.3247538266804268 + "k1": 2.0014646739902733, + "k1L": 0.16011717391922187 }, "SATUN24.MQUA080": { - "k1": 4.080041726792059, - "k1L": 0.32640333814336475 + "k1": 1.7512020269545436, + "k1L": 0.1400961621563635 }, "SATUN25.MQUA080": { - "k1": -4.059422833505335, - "k1L": -0.3247538266804268 + "k1": -3.782539660566574, + "k1L": -0.30260317284532595 }, "SATUN26.MQUA080": { - "k1": 4.080041726792059, - "k1L": 0.32640333814336475 + "k1": 2.725469470128964, + "k1L": 0.21803755761031712 }, "SATBD01.MQUA010": { - "k1": 0.0, - "k1L": 0.0 + "k1": 0.5069789237265826, + "k1L": 0.15209367711797478 }, "SATBD01.MQUA030": { - "k1": 0.0, - "k1L": 0.0 + "k1": -0.6184665903305938, + "k1L": -0.18553997709917813 }, "SATBD01.MQUA050": { - "k1": 0.0, - "k1L": 0.0 + "k1": 0.1324854421128419, + "k1L": 0.03974563263385257 }, "SATBD01.MQUA070": { - "k1": 0.0, - "k1L": 0.0 + "k1": 0.474028017341573, + "k1L": 0.1422084052024719 }, "SATBD01.MQUA090": { - "k1": 0.0, - "k1L": 0.0 + "k1": -0.7442648986155268, + "k1L": -0.22327946958465802 }, "S10BD01.MQUA010": { "k1": 0, @@ -881,8 +881,8 @@ "k1L": -0.6299996827041936 }, "SATBD02.MQUA030": { - "k1": 0.0, - "k1L": 0.0 + "k1": -1.050806764409536, + "k1L": -0.3152420293228608 }, "SPOSY01.MQUA030": { "k1": 0, @@ -1977,24 +1977,24 @@ "design_kick": 0.0 }, "S20SY02.MKDC010": { - "cory": 0, - "design_kick": 0.0002026741726149139 + "cory": 0.00020267419889973776, + "design_kick": 0.00020267420740693602 }, "S20SY02.MKAC020": { - "cory": 0, - "design_kick": 0.0003040112589223708 + "cory": 0.0, + "design_kick": 0.000304011311110404 }, "S20SY02.MKDC030": { - "cory": 0, - "design_kick": 0.0002026741726149139 + "cory": 0.00020267419889973776, + "design_kick": 0.00020267420740693602 }, "S20SY02.MKAC040": { - "cory": 0, - "design_kick": 0.0003040112589223708 + "cory": 0.0, + "design_kick": 0.000304011311110404 }, "S20SY02.MKDC050": { - "cory": 0, - "design_kick": 0.0002026741726149139 + "cory": 0.00020267419889973776, + "design_kick": 0.00020267420740693602 }, "S30CB15.MKDC030": { "cory": 0,