From 437d031b719ecdd819da90a9cdf38f1716d54fee Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 28 Jan 2026 10:08:22 +0100 Subject: [PATCH] Reference Optics with and without compression in Switchyard --- .gitignore | 1 + .../Reference-SwissFEL/matchAthos.madx | 15 +- .../matchSYCompression.madx | 221 ++++++++++ .../Current/Reference-SwissFEL/settings.json | 414 +++++++++--------- 4 files changed, 439 insertions(+), 212 deletions(-) create mode 100644 Scripts/Current/Reference-SwissFEL/matchSYCompression.madx diff --git a/.gitignore b/.gitignore index 5128d08..e5c65da 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /.idea/vcs.xml /.idea/workspace.xml /unused/Elegant/ +madx.ps diff --git a/Scripts/Current/Reference-SwissFEL/matchAthos.madx b/Scripts/Current/Reference-SwissFEL/matchAthos.madx index fc718d7..f07831e 100644 --- a/Scripts/Current/Reference-SwissFEL/matchAthos.madx +++ b/Scripts/Current/Reference-SwissFEL/matchAthos.madx @@ -43,6 +43,8 @@ use,sequence=swissfel; select,flag=Error,pattern="SAT.*"; ealign,DY=0.01; +if (leakdisp == 0){ + satsy01.mqua020.k1 := 0.48577; satsy01.mqua040.k1 := 1.0122; satsy01.mqua070.k1 := -0.055; @@ -80,7 +82,7 @@ VARY, NAME=satsy01.mqua230.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; VARY, NAME=satsy01.mqua210.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; VARY, NAME=satsy01.mqua300.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; VARY, NAME=satsy01.mqua280.k1, STEP=0.00001,LOWER=-4,UPPER=4; -CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DX = leakdisp; ! good value is about -0.03 +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DX = 0; CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DPX = 0; CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DY < -0.008; CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, X<10; @@ -88,9 +90,6 @@ LMDIF, CALLS=1000, TOLERANCE=1.E-21; ENDMATCH; - -!satsy01.mqua280.k1 = satsy01.mqua280.k1*(1+leakdisp); - !------------------------------------------ ! close vertical dispersion satcl01.mqsk125.k1 = 0; @@ -161,11 +160,17 @@ LMDIF, CALLS=1000, TOLERANCE=1.E-21; ENDMATCH; twiss,sequence=swissfel,range=s20sy02$start/satcl01$end,rmatrix,beta0=twisssep; - plot,haxis=s,vaxis=betx,bety,range=s20SY02$start/#e,colour=100; plot,haxis=s,vaxis=dx,dy,range=s20SY02$start/#e,colour=100; plot,haxis=s,vaxis=re56,range=s20SY02$start/#e,colour=100; +} else { +! matching with compression +call, file = 'matchSYCompression.madx'; +} + + + !--------------------------------------- ! match first cell of linac1RF cell of Athos diff --git a/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx b/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx new file mode 100644 index 0000000..13a840d --- /dev/null +++ b/Scripts/Current/Reference-SwissFEL/matchSYCompression.madx @@ -0,0 +1,221 @@ + +! current solution to compress in switchyard. +! according to current machine settings the maximum is 2.14 @ 3.21 GeV +Kmin=-2.1; +Kmax=2.1; + + +!--------------------------------- +! match first half of SATSY01 + + +satsy01.mqua020.k1 := 0.35; +satsy01.mqua040.k1 := 1.75; +satsy01.mqua070.k1 := -2.; +satsy01.mqua090.k1 := -1.22; + +Print,text='MATCH POINT: Match Dispersion at Center Dipole of SATSY01'; +MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satsy01.mqua020.k1, STEP=0.00001,LOWER=-4,UPPER=4; +VARY, NAME=satsy01.mqua040.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy01.mqua070.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy01.mqua090.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01.mbnd200, DX = 0.082; ! +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01.mbnd200, DPX = 0.0084; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01.mbnd200, DY < 0.09; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01.mbnd200, DPY < 1; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + +!------------------------------------- +! match second half of SATSY01 - closing dispersion + + +satsy01.mqua210.k1=satsy01.mqua090.k1; +satsy01.mqua230.k1=satsy01.mqua070.k1; +satsy01.mqua260.k1=satsy01.mqua040.k1; +satsy01.mqua280.k1=satsy01.mqua020.k1; +satsy01.mqua300.k1 := 5.27400e-01; + + +DXS = -0.030; +DPXS = -0.001; + +Print,text='MATCH POINT: Match Dispersion at End of SATSY01'; +MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satsy01.mqua280.k1, STEP=0.00001,LOWER=-4,UPPER=4; +VARY, NAME=satsy01.mqua300.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DX = DXS; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DPX =DPXS; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, X < 0.1; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + + +!------------------------------------------ +! close vertical dispersion + + +satsy02.mqua010.k1 := - 1.71; +satsy02.mqua110.k1 := 1.22622; +satsy02.mqua120.k1 := 1.64073; +satsy02.mqua230.k1 = -1.61620; + + +Print,text='MATCH POINT: Close Vertical Dispersion'; +MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satsy02.mqua010.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy02.mqua110.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy02.mqua120.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy02$end, DY = 0.0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy02$end, DPY = 0.0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy02$end, X = 0.0; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + + +!--------------------------------- +! match sextupoles + + +satsy01.msex050.k2 = 100; +satsy01.msex080.k2 = -100; +satsy01.msex220.k2 = -100; +satsy01.msex250.k2 = 100; + + +Print,text='MATCH POINT: Sextupoles in SATSY01 and SATSY02'; +MATCH,chrom, SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satsy01.msex050.k2, STEP=0.00001; +VARY, NAME=satsy01.msex080.k2, STEP=0.00001; +VARY, NAME=satsy01.msex220.k2, STEP=0.00001; +VARY, NAME=satsy01.msex250.k2, STEP=0.00001; + +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satsy02$end, DDX = 0; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satsy02$end, DDY = 0; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satsy02$end, DDPX = 0; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satsy02$end, DDPY = 0; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + +twiss, chrom,rmatrix, SEQUENCE=swissFEL, range=s20SY02$start/satcl01$end,beta0=twisssep; +plot,haxis=s,vaxis=betx,bety,range = s20sy02$start/satsy02$end, colour=100; +plot,haxis=s,vaxis=dx,dy,range = s20sy02$start/satsy02$end,colour=100; +plot,haxis=s,vaxis=ddx,ddy,range = s20sy02$start/satsy02$end,colour=100; +plot,haxis=s,vaxis=re56,range = s20sy02$start/satsy02$end,colour=100; + + + + + +!------------------------------------------------- +!------ Match horizontal dispersion in collimator + +! was -1.2 and 1 +satcl011:=-1.3; +satcl012:= 1.1; +satcl01.mqua120.k1:=satcl011; +satcl01.mqua130.k1:=satcl012; +satcl01.mqua180.k1:=satcl012; +satcl01.mqua190.k1:=satcl011; + + +Print,text='MATCH POINT: Close Dispersion in SATCL01'; +MATCH, SEQUENCE=swissfel, range=SATCL01$START/SATCL01$END,betx=5,alfx=0,bety=30,alfy=0; +VARY, NAME=satcl011, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satcl012, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, DX = 0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, DPX = 0; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + +satcl01.mqua120.k1=satcl011; +satcl01.mqua130.k1=satcl012; +satcl01.mqua180.k1=satcl012; +satcl01.mqua190.k1=satcl011; + + + + + +!------------------------------------------------------------ +!------ Match the phase advance between the two double bends + + +satsy02.mqua230.k1 = -1.28; +satsy03.mqua010.k1 = -0.44; +satsy03.mqua040.k1 = -0.9; +satsy03.mqua070.k1 = 1.6; +satsy03.mqua100.k1 = 0.55; +satsy03.mqua130.k1 = -0.93; + +Print,text='MATCH POINT: Match into SATCL01'; +MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satsy02.mqua230.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy03.mqua010.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy03.mqua040.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy03.mqua070.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy03.mqua100.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satsy03.mqua130.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,betx=10.8; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,alfx=0; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,bety<30.8; ! was 13.8 +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,alfy=0.; +constraint, sequence=swissfel, range=satsy03.mqua130$end, betx <80 ; +constraint, sequence=swissfel, range=satsy03.mqua130$end, bety <80 ; +constraint, sequence=swissfel, range=satsy03$end, DX = 0.042; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + +twiss, chrom,rmatrix, SEQUENCE=swissFEL, range=s20SY02$start/satcl01$end,beta0=twisssep; +plot,haxis=s,vaxis=betx,bety,range = s20sy02$start/satsy02$end, colour=100; +plot,haxis=s,vaxis=dx,dy,range = s20sy02$start/satsy02$end,colour=100; +plot,haxis=s,vaxis=ddx,ddy,range = s20sy02$start/satsy02$end,colour=100; +plot,haxis=s,vaxis=re56,range = s20sy02$start/satsy02$end,colour=100; + + + + +!-------------------------- +! close dispersion in SATCL01 +Print,text='MATCH POINT: Close Dispersion in Switchyard'; +MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satsy03.mqua130.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satcl01.mqua120.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satcl01.mqua130.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satcl01.mqua190.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +VARY, NAME=satcl01.mqua180.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, DX = 0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, DPX = 0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, bety < 100; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, betx < 10; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, Y < 1; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + + +!------------------------------------ +! optimize sextupoles in SATCL01 + +satcl01.msex110.k2 = 76.01; +satcl01.msex160.k2 = -59.; + + +Print,text='MATCH POINT: Sextupoles in SATCL01'; +MATCH, chrom, SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; +VARY, NAME=satcl01.msex110.k2, STEP=0.00001,LOWER=-200,UPPER=200; +VARY, NAME=satcl01.msex160.k2, STEP=0.00001,LOWER=-200,UPPER=200; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, DDX = 0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, DDPX = 0; +LMDIF, CALLS=1000, TOLERANCE=1.E-21; +ENDMATCH; + + + + diff --git a/Scripts/Current/Reference-SwissFEL/settings.json b/Scripts/Current/Reference-SwissFEL/settings.json index 184c615..bf91769 100644 --- a/Scripts/Current/Reference-SwissFEL/settings.json +++ b/Scripts/Current/Reference-SwissFEL/settings.json @@ -69,40 +69,40 @@ "k1L": -0.1793757940018433 }, "SINSB04.MQUA130": { - "k1": 0.7084748994661481, - "k1L": 0.1062712349199222 + "k1": 0.7084748994661484, + "k1L": 0.10627123491992226 }, "SINSB04.MQUA230": { - "k1": -0.7081053976736001, - "k1L": -0.10621580965104002 + "k1": -0.7081053976736004, + "k1L": -0.10621580965104005 }, "SINSB05.MQUA130": { - "k1": 0.7084748994661481, - "k1L": 0.1062712349199222 + "k1": 0.7084748994661484, + "k1L": 0.10627123491992226 }, "SINSB05.MQUA230": { - "k1": -0.7081053976736001, - "k1L": -0.10621580965104002 + "k1": -0.7081053976736004, + "k1L": -0.10621580965104005 }, "SINBC01.MQUA020": { - "k1": 0.035868, - "k1L": 0.005380199999999999 + "k1": 0.034966, + "k1L": 0.005244899999999999 }, "SINBC01.MQUA050": { - "k1": 0.006343, - "k1L": 0.00095145 + "k1": 0.006852, + "k1L": 0.0010278 }, "SINBC01.MQUA070": { - "k1": 0.008458, - "k1L": 0.0012687 + "k1": 0.009148, + "k1L": 0.0013721999999999999 }, "SINBC01.MQUA090": { - "k1": 0.005479, - "k1L": 0.0008218500000000001 + "k1": 0.005371, + "k1L": 0.00080565 }, "SINBC01.MQUA110": { - "k1": 0.579057, - "k1L": 0.08685855 + "k1": 0.578802, + "k1L": 0.0868203 }, "SINBC02.MQSK110": { "k1": 0.0, @@ -121,132 +121,132 @@ "k1L": 0.0 }, "SINDI01.MQUA020": { - "k1": 0.053767, - "k1L": 0.00806505 + "k1": 0.053693, + "k1L": 0.008053949999999999 }, "SINDI01.MQSK030": { "k1": 0.0, "k1L": 0.0 }, "SINDI01.MQUA070": { - "k1": -0.147298, - "k1L": -0.022094700000000002 + "k1": -0.147272, + "k1L": -0.022090799999999997 }, "SINDI02.MQUA020": { - "k1": -1.1155488329545424, - "k1L": -0.16733232494318137 + "k1": -0.855200253107939, + "k1L": -0.12828003796619084 }, "SINDI02.MQUA030": { - "k1": -0.04300458177230275, - "k1L": -0.006450687265845413 + "k1": -0.08287827833640135, + "k1L": -0.012431741750460202 }, "SINDI02.MQUA050": { - "k1": 1.1682738476872743, - "k1L": 0.17524107715309115 + "k1": 2.1272271444855293, + "k1L": 0.3190840716728294 }, "SINDI02.MQUA060": { - "k1": 1.0821636087579767, - "k1L": 0.1623245413136965 + "k1": -2.1843319443265963, + "k1L": -0.32764979164898944 }, "SINDI02.MQUA090": { - "k1": -0.2963160142228309, - "k1L": -0.04444740213342463 + "k1": 1.9412845065192323, + "k1L": 0.29119267597788484 }, "S10CB01.MQUA230": { - "k1": -0.9430803588924669, - "k1L": -0.14146205383387003 + "k1": -0.9462399711346737, + "k1L": -0.14193599567020104 }, "S10CB01.MQUA430": { - "k1": 1.8700351214338993, - "k1L": 0.28050526821508487 + "k1": 1.9632202193593487, + "k1L": 0.29448303290390226 }, "S10CB02.MQUA230": { - "k1": -1.5169102297795856, - "k1L": -0.22753653446693783 + "k1": -1.5169102297795853, + "k1L": -0.22753653446693778 }, "S10CB02.MQUA430": { - "k1": 1.516843495910926, - "k1L": 0.2275265243866389 + "k1": 1.5168434959109265, + "k1L": 0.22752652438663895 }, "S10DI01.MQUA030": { "k1": 0.0, "k1L": 0.0 }, "S10DI01.MQUA120": { - "k1": -1.5169102297795856, - "k1L": -0.22753653446693783 + "k1": -1.5169102297795853, + "k1L": -0.22753653446693778 }, "S10CB03.MQUA230": { - "k1": 1.516843495910926, - "k1L": 0.2275265243866389 + "k1": 1.5168434959109265, + "k1L": 0.22752652438663895 }, "S10CB03.MQUA430": { - "k1": -1.5169102297795856, - "k1L": -0.22753653446693783 + "k1": -1.5169102297795853, + "k1L": -0.22753653446693778 }, "S10CB04.MQUA230": { - "k1": 1.516843495910926, - "k1L": 0.2275265243866389 + "k1": 1.5168434959109265, + "k1L": 0.22752652438663895 }, "S10CB04.MQUA430": { - "k1": -1.5169102297795856, - "k1L": -0.22753653446693783 + "k1": -1.5169102297795853, + "k1L": -0.22753653446693778 }, "S10CB05.MQUA230": { - "k1": 1.516843495910926, - "k1L": 0.2275265243866389 + "k1": 1.5168434959109265, + "k1L": 0.22752652438663895 }, "S10CB05.MQUA430": { - "k1": -1.5169102297795856, - "k1L": -0.22753653446693783 + "k1": -1.5169102297795853, + "k1L": -0.22753653446693778 }, "S10CB06.MQUA230": { - "k1": 1.516843495910926, - "k1L": 0.2275265243866389 + "k1": 1.5168434959109265, + "k1L": 0.22752652438663895 }, "S10CB06.MQUA430": { - "k1": -1.5169102297795856, - "k1L": -0.22753653446693783 + "k1": -1.5169102297795853, + "k1L": -0.22753653446693778 }, "S10CB07.MQUA230": { - "k1": 1.516843495910926, - "k1L": 0.2275265243866389 + "k1": 1.5168434959109265, + "k1L": 0.22752652438663895 }, "S10CB07.MQUA430": { - "k1": -1.5129774896991848, - "k1L": -0.2269466234548777 + "k1": -1.5129774896990908, + "k1L": -0.2269466234548636 }, "S10CB08.MQUA230": { - "k1": 1.5179443846032685, - "k1L": 0.22769165769049027 + "k1": 1.517944384602827, + "k1L": 0.22769165769042404 }, "S10CB08.MQUA430": { - "k1": -1.5096528272269247, - "k1L": -0.2264479240840387 + "k1": -1.5096528272270517, + "k1L": -0.22644792408405776 }, "S10CB09.MQUA230": { - "k1": 1.5062716634435955, - "k1L": 0.2259407495165393 + "k1": 1.5062716634436102, + "k1L": 0.22594074951654153 }, "S10BC01.MQUA020": { - "k1": 2.085769566548272, - "k1L": 0.3128654349822408 + "k1": 1.85173448401334, + "k1L": 0.277760172602001 }, "S10BC01.MQUA040": { - "k1": -0.8069033654778649, - "k1L": -0.12103550482167973 + "k1": -0.7295011324336752, + "k1L": -0.10942516986505128 }, "S10BC01.MQUA060": { - "k1": -1.725445134057659, - "k1L": -0.25881677010864884 + "k1": -1.5784125730265695, + "k1L": -0.2367618859539854 }, "S10BC01.MQUA080": { - "k1": 0.7124612755726865, - "k1L": 0.10686919133590296 + "k1": 0.1817690389691952, + "k1L": 0.02726535584537928 }, "S10BC01.MQUA100": { - "k1": 1.0847185269653656, - "k1L": 0.16270777904480485 + "k1": 1.3963958292657253, + "k1L": 0.2094593743898588 }, "S10BC02.MQSK110": { "k1": 0.0, @@ -265,24 +265,24 @@ "k1L": 0.0 }, "S10MA01.MQUA020": { - "k1": -0.952016344921428, - "k1L": -0.14280245173821418 + "k1": -0.9879023870679028, + "k1L": -0.1481853580601854 }, "S10MA01.MQUA050": { - "k1": -0.25860452290414104, - "k1L": -0.03879067843562115 + "k1": -0.2955602713546331, + "k1L": -0.04433404070319496 }, "S10MA01.MQUA070": { - "k1": 1.5927258007226863, - "k1L": 0.23890887010840295 + "k1": 0.597475935273834, + "k1L": 0.0896213902910751 }, "S10MA01.MQUA110": { - "k1": -0.9147490503383028, - "k1L": -0.1372123575507454 + "k1": 1.1172009381553722, + "k1L": 0.16758014072330582 }, "S10MA01.MQUA130": { - "k1": 0.6789894261695975, - "k1L": 0.10184841392543961 + "k1": -0.5024078715440069, + "k1L": -0.07536118073160103 }, "S20CB01.MQUA430": { "k1": -0.8635667730961264, @@ -329,24 +329,24 @@ "k1L": -0.18263923557583664 }, "S20SY03.MQUA020": { - "k1": 0.8592016943667193, - "k1L": 0.1288802541550079 + "k1": 0.8592069608422452, + "k1L": 0.12888104412633677 }, "S20SY03.MQUA030": { - "k1": 0.6145489000262874, - "k1L": 0.0921823350039431 + "k1": 0.6145394668201571, + "k1L": 0.09218092002302357 }, "S20SY03.MQUA050": { - "k1": -0.08131657881685135, - "k1L": -0.012197486822527703 + "k1": -0.08130714629328406, + "k1L": -0.012196071943992609 }, "S20SY03.MQUA060": { - "k1": -1.268463537232424, - "k1L": -0.1902695305848636 + "k1": -1.2684668897196494, + "k1L": -0.1902700334579474 }, "S20SY03.MQUA100": { - "k1": 0.42585350235555686, - "k1L": 0.06387802535333352 + "k1": 0.42585555207159437, + "k1L": 0.06387833281073915 }, "S30CB01.MQUA430": { "k1": 0.8200899250742555, @@ -369,20 +369,20 @@ "k1L": 0.12301348876113832 }, "S30CB06.MQUA430": { - "k1": -0.8191461508460278, - "k1L": -0.12287192262690416 + "k1": -0.8191461508459634, + "k1L": -0.1228719226268945 }, "S30CB07.MQUA430": { - "k1": 0.819477749350287, - "k1L": 0.12292166240254306 + "k1": 0.8194777493503408, + "k1L": 0.12292166240255112 }, "S30CB08.MQUA430": { - "k1": -0.8180579224051746, - "k1L": -0.12270868836077618 + "k1": -0.8180579224051848, + "k1L": -0.12270868836077772 }, "S30CB09.MQUA430": { - "k1": 0.8181700346634088, - "k1L": 0.12272550519951131 + "k1": 0.818170034663627, + "k1L": 0.12272550519954405 }, "S30CB10.MQUA430": { "k1": -0.8200880145207072, @@ -409,28 +409,28 @@ "k1L": 0.12301348876113832 }, "SARCL01.MQUA020": { - "k1": -0.4721947573633969, - "k1L": -0.14165842720901906 + "k1": -0.3109183657708632, + "k1L": -0.09327550973125895 }, "SARCL01.MQUA050": { - "k1": 0.8586585366315584, - "k1L": 0.2575975609894675 + "k1": 1.1323860413233364, + "k1L": 0.33971581239700094 }, "SARCL01.MQUA080": { - "k1": -0.2762157259007257, - "k1L": -0.0828647177702177 + "k1": -1.0592284165864374, + "k1L": -0.3177685249759312 }, "SARCL01.MQUA100": { - "k1": -0.6942420234208115, - "k1L": -0.20827260702624345 + "k1": 0.4977126953750365, + "k1L": 0.14931380861251095 }, "SARCL01.MQUA140": { - "k1": 1.9079279284588924, - "k1L": 0.5723783785376677 + "k1": 1.5888200788912714, + "k1L": 0.4766460236673814 }, "SARCL01.MQUA190": { - "k1": -1.3480651440295461, - "k1L": -0.4044195432088638 + "k1": -1.4664371645567087, + "k1L": -0.4399311493670126 }, "SARCL02.MQUA130": { "k1": 2.470468387349568, @@ -477,24 +477,24 @@ "k1L": 0.7411405162048703 }, "SARMA01.MQUA010": { - "k1": -1.1298461424430046, - "k1L": -0.33895384273290136 + "k1": -1.0864834489771846, + "k1L": -0.3259450346931554 }, "SARMA01.MQUA060": { - "k1": 1.4322857481803157, - "k1L": 0.4296857244540947 + "k1": 1.6964569186924352, + "k1L": 0.5089370756077305 }, "SARMA01.MQUA080": { - "k1": -0.6836560498111524, - "k1L": -0.2050968149433457 + "k1": -0.7264289912745869, + "k1L": -0.21792869738237608 }, "SARMA01.MQUA120": { - "k1": -0.1863031534579322, - "k1L": -0.05589094603737966 + "k1": -0.35539330603516206, + "k1L": -0.10661799181054861 }, "SARMA01.MQUA140": { - "k1": 0.36360900263012363, - "k1L": 0.10908270078903709 + "k1": 0.7749714418886964, + "k1L": 0.2324914325666089 }, "SARMA02.MQUA050": { "k1": -0.0, @@ -629,92 +629,92 @@ "k1L": 0.07911 }, "SATSY02.MQUA010": { - "k1": -1.863246870188803, - "k1L": -0.2794870305283204 + "k1": -1.8632350867894103, + "k1L": -0.27948526301841153 }, "SATSY02.MQUA110": { - "k1": 2.09998, - "k1L": 0.31499699999999997 + "k1": 2.099994525259484, + "k1L": 0.3149991787889226 }, "SATSY02.MQUA120": { - "k1": -1.3376269839225505, - "k1L": -0.20064404758838258 + "k1": -1.3376004646987845, + "k1L": -0.20064006970481765 }, "SATSY02.MQUA230": { - "k1": 0.9794423515033617, - "k1L": 0.14691635272550424 + "k1": 0.80646508131005, + "k1L": 0.1209697621965075 }, "SATSY03.MQUA010": { - "k1": -0.5694156597452804, - "k1L": -0.08541234896179206 + "k1": -0.6767219980657146, + "k1L": -0.1015082997098572 }, "SATSY03.MQUA040": { - "k1": -0.24586685750161577, - "k1L": -0.03688002862524237 + "k1": 0.13543742238797846, + "k1L": 0.020315613358196767 }, "SATSY03.MQUA070": { - "k1": 1.06006830306547, - "k1L": 0.1590102454598205 + "k1": 0.6910400879940611, + "k1L": 0.10365601319910916 }, "SATSY03.MQUA100": { - "k1": 1.0660997883422791, - "k1L": 0.15991496825134185 + "k1": 1.27839824320138, + "k1L": 0.191759736480207 }, "SATSY03.MQUA130": { - "k1": -0.632240294260727, - "k1L": -0.09483604413910905 + "k1": -1.6570170736362038, + "k1L": -0.24855256104543055 }, "SATCL01.MQUA120": { - "k1": -1.5422105147992289, - "k1L": -0.23133157721988432 + "k1": -1.118726772197146, + "k1L": -0.1678090158295719 }, "SATCL01.MQSK125": { "k1": 0, "k1L": 0.0 }, "SATCL01.MQUA130": { - "k1": 1.775324913542334, - "k1L": 0.2662987370313501 + "k1": 1.7396886826914422, + "k1L": 0.26095330240371634 }, "SATCL01.MQUA180": { - "k1": 1.7753268229251369, - "k1L": 0.26629902343877054 + "k1": 1.7396881787706504, + "k1L": 0.26095322681559757 }, "SATCL01.MQUA190": { - "k1": -1.5422136922552871, - "k1L": -0.23133205383829306 + "k1": -1.1187244321799967, + "k1L": -0.1678086648269995 }, "SATDI01.MQUA025": { - "k1": -0.006426559844529357, - "k1L": -0.0009639839766794035 + "k1": -1.0182230519177864, + "k1L": -0.15273345778766795 }, "SATDI01.MQUA080": { - "k1": 0.5695462762192454, - "k1L": 0.08543194143288681 + "k1": 0.8831965025090273, + "k1L": 0.13247947537635407 }, "SATDI01.MQUA220": { - "k1": 1.0651727343565924, - "k1L": 0.15977591015348885 + "k1": 0.752777872599073, + "k1L": 0.11291668088986095 }, "SATDI01.MQUA230": { - "k1": -1.0726810528215058, - "k1L": -0.16090215792322587 + "k1": -0.8913928981479108, + "k1L": -0.13370893472218662 }, "SATDI01.MQUA250": { - "k1": 0.5133752059634685, - "k1L": 0.07700628089452027 + "k1": 0.5133752059646293, + "k1L": 0.07700628089469438 }, "SATDI01.MQUA260": { - "k1": 0.020908544783342153, - "k1L": 0.003136281717501323 + "k1": 0.020908544780951843, + "k1L": 0.0031362817171427765 }, "SATDI01.MQUA280": { - "k1": -0.15397487583082922, - "k1L": -0.023096231374624382 + "k1": -0.15397487582922514, + "k1L": -0.023096231374383772 }, "SATDI01.MQUA300": { - "k1": -0.40769177837501747, - "k1L": -0.061153766756252614 + "k1": -0.4076917783753463, + "k1L": -0.06115376675630194 }, "SATCB01.MQUA230": { "k1": 0.45565642715018484, @@ -733,52 +733,52 @@ "k1L": -0.06834846407258482 }, "SATMA01.MQUA050": { - "k1": 0.12494253895125812, - "k1L": 0.00999540311610065 + "k1": 0.049188966252990914, + "k1L": 0.003935117300239273 }, "SATMA01.MQUA120": { - "k1": 0.36580812885808667, - "k1L": 0.029264650308646934 + "k1": 1.3066481124057288, + "k1L": 0.1045318489924583 }, "SATMA01.MQUA140": { - "k1": 1.2551688306881554, - "k1L": 0.10041350645505244 + "k1": -0.8456377216590887, + "k1L": -0.0676510177327271 }, "SATMA01.MQUA160": { - "k1": -0.6506395391365137, - "k1L": -0.0520511631309211 + "k1": 1.204007851089999, + "k1L": 0.09632062808719992 }, "SATMA01.MQUA180": { - "k1": -2.47504853282001, - "k1L": -0.1980038826256008 + "k1": -2.76211946765235, + "k1L": -0.220969557412188 }, "SATMA01.MQUA230": { - "k1": 0.4779018609371943, - "k1L": 0.038232148874975544 + "k1": -0.3024929322640702, + "k1L": -0.024199434581125615 }, "SATMA01.MQUA250": { - "k1": 2.0084531498602174, - "k1L": 0.16067625198881738 + "k1": 2.578019508570987, + "k1L": 0.20624156068567895 }, "SATMA01.MQUA610": { - "k1": -1.4163043141063751, - "k1L": -0.21244564711595626 + "k1": -1.4163043129121315, + "k1L": -0.21244564693681972 }, "SATMA01.MQUA630": { - "k1": 1.9138919932080345, - "k1L": 0.2870837989812052 + "k1": 1.913891993184131, + "k1L": 0.28708379897761965 }, "SATMA01.MQUA640": { - "k1": 0.8803820321663556, - "k1L": 0.13205730482495334 + "k1": 0.8803820317217748, + "k1L": 0.13205730475826621 }, "SATUN04.MQUA060": { - "k1": -2.219765042959643, - "k1L": -0.17758120343677145 + "k1": -2.2197650453967457, + "k1L": -0.17758120363173965 }, "SATUN05.MQUA420": { - "k1": -1.211228003134308, - "k1L": -0.09689824025074463 + "k1": -1.211228, + "k1L": -0.09689824 }, "SATUN06.MQUA080": { "k1": 3.8261274687710416, @@ -845,28 +845,28 @@ "k1L": -0.30466611103290253 }, "SATUN22.MQUA080": { - "k1": 1.4409086581447608, - "k1L": 0.11527269265158087 + "k1": 4.999997680293795, + "k1L": 0.39999981442350363 }, "SATMA02.MQUA010": { - "k1": -3.446342081676855, - "k1L": -0.2757073665341484 + "k1": -0.27122321273521066, + "k1L": -0.021697857018816852 }, "SATMA02.MQUA020": { - "k1": -0.9038263098875778, - "k1L": -0.07230610479100623 + "k1": -1.586646767863541, + "k1L": -0.12693174142908328 }, "SATMA02.MQUA040": { - "k1": 1.5171487105828372, - "k1L": 0.12137189684662698 + "k1": -0.6249634311265162, + "k1L": -0.0499970744901213 }, "SATMA02.MQUA050": { - "k1": 2.3325743139954573, - "k1L": 0.1866059451196366 + "k1": 3.450456194691823, + "k1L": 0.2760364955753459 }, "SATMA02.MQUA070": { - "k1": -2.6864330672728878, - "k1L": -0.21491464538183103 + "k1": -1.9227629926181675, + "k1L": -0.1538210394094534 }, "SATBD01.MQUA010": { "k1": 0.5069789237265826, @@ -893,7 +893,7 @@ "k1L": 0.0 }, "SARBD02.MQUA030": { - "k1": 0.0, + "k1": 0, "k1L": 0.0 }, "SATBD02.MQUA030": {