From 85e73c09d5b76b967726b5cd135568f901fa2b3d Mon Sep 17 00:00:00 2001 From: Sven Date: Tue, 15 Sep 2026 14:11:54 +0200 Subject: [PATCH] Working on the design optics for SF+ --- OpticsTools.py | 2 +- Scripts/Final/SFPlus/matchAramis.madx | 35 +- Scripts/Final/SFPlus/settings.json | 622 +++++++++++++------------- 3 files changed, 338 insertions(+), 321 deletions(-) diff --git a/OpticsTools.py b/OpticsTools.py index 5b1283f..c55515f 100644 --- a/OpticsTools.py +++ b/OpticsTools.py @@ -250,7 +250,7 @@ class OpticsTools(QtWidgets.QMainWindow, QtCore.QObject, Ui_OpticsGUI): if __name__ == '__main__': QtWidgets.QApplication.setStyle(QtWidgets.QStyleFactory.create("plastique")) parser = ArgumentParser() - parser.add_argument('-phase', type=int, help='Select Phase of the Lattice', default=0) + parser.add_argument('-phase', type=int, help='Select Phase of the Lattice', default=2) parser.add_argument('-offline', type=int, help='Excludes any connection to control system', default=1) args = parser.parse_args() app = QtWidgets.QApplication(sys.argv) diff --git a/Scripts/Final/SFPlus/matchAramis.madx b/Scripts/Final/SFPlus/matchAramis.madx index 4ad2af8..114c684 100644 --- a/Scripts/Final/SFPlus/matchAramis.madx +++ b/Scripts/Final/SFPlus/matchAramis.madx @@ -213,14 +213,15 @@ if (ECOLasBC ==0.) { sarcl02.mqua460.k1=sarcl02.mqua130.k1; dL=0.625+0.25; - bx0=25; + bx0=25-20; bx=bx0+dL*dL/bx0; ax=-dL/bx0; - by0=0.8; + by0=1.2; by=by0+dL*dL/by0; ay=-dL/by0; - twiss,sequence=swissfel,range=sarcl02.mqsk300/sarcl02$end,betx=bx,alfx=ax,bety=by,alfy=ay; + + twiss,sequence=swissfel,range=sarcl02.mqsk300$start/sarma01$start,betx=bx,alfx=ax,bety=by,alfy=ay; plot,haxis=s,vaxis=betx,bety,colour=100; nbetx= table(twiss,sarcl02$end,betx); @@ -282,34 +283,38 @@ sarcl01.mqua190.k1 := -1.475278354; use,sequence=swissfel; Print,text='MATCH POINT: Match into Energy Collimator'; -MATCH,SEQUENCE=swissfel,range=s20SY02$start/sarma02$start,beta0=twisssep; -VARY,NAME=sarcl01.mqua020.k1,STEP=0.0001,lower=-1., upper =1.; +MATCH,SEQUENCE=swissfel,range=s20SY02$start/sarma01$end,beta0=twisssep; +VARY,NAME=sarcl01.mqua020.k1,STEP=0.0001;!,lower=-1., upper =1.; VARY,NAME=sarcl01.mqua050.k1,STEP=0.0001; VARY,NAME=sarcl01.mqua080.k1,STEP=0.0001; VARY,NAME=sarcl01.mqua100.k1,STEP=0.0001; VARY,NAME=sarcl01.mqua140.k1,STEP=0.0001; VARY,NAME=sarcl01.mqua190.k1,STEP=0.0001; if (ECOLasBC ==0.){ - CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,betx=twissARECOL->BETX; - CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,alfx=twissARECOL->ALFX; - CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,bety=twissARECOL->BETY; - CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,alfy=twissARECOL->ALFY; - CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua050,bety<30; - CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua190,betx<30; + ! CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,betx=twissARECOL->BETX; + ! CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,alfx=twissARECOL->ALFX; + ! CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,bety=twissARECOL->BETY; + ! CONSTRAINT,SEQUENCE=swissfel,range=sarma01.mqua010$start,alfy=twissARECOL->ALFY; + constraint,sequence=swissfel,range=sarcl02$start,betx=nbetx; + constraint,sequence=swissfel,range=sarcl02$start,bety=nbety; + constraint,sequence=swissfel,range=sarcl02$start,alfx=nalfx; + constraint,sequence=swissfel,range=sarcl02$start,alfy=nalfy; + CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua050$start,bety<30; + CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua190$start,betx<30; } else { - CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.dscr280$start,betx = 10; + CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.dscr280$start,betx = 10; CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.dscr280$start,alfx=0.14; CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.dscr280$start,bety = 10; CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.dscr280$start,alfy=0.14; - CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua050,bety<70; - CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua190,betx<70; + CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua050$start,bety<70; + CONSTRAINT,SEQUENCE=swissfel,range=sarcl01.mqua190$start,betx<70; } LMDIF,CALLS=100,TOLERANCE=1.e-21; ENDMATCH; -twiss,sequence=swissfel,range=s20SY02$start/sarcl01$start,beta0=twisssep; +twiss,sequence=swissfel,range=s20SY02$start/sarma01$start,beta0=twisssep; plot,haxis=s,vaxis=betx,bety,range=S30CB15$START/SARCL02$END,colour=100; diff --git a/Scripts/Final/SFPlus/settings.json b/Scripts/Final/SFPlus/settings.json index 19e9b44..242682f 100644 --- a/Scripts/Final/SFPlus/settings.json +++ b/Scripts/Final/SFPlus/settings.json @@ -17,52 +17,52 @@ "k1L": 0.0 }, "SINLH01.MQUA020": { - "k1": 0.394150214819238, - "k1L": 0.0591225322228857 + "k1": 0.36620934394283317, + "k1L": 0.054931401591424976 }, "SINLH01.MQUA040": { - "k1": -0.06117929231911987, - "k1L": -0.009176893847867981 + "k1": -0.013814977177058532, + "k1L": -0.0020722465765587797 }, "SINLH01.MQUA070": { - "k1": 0.8946140056813822, - "k1L": 0.1341921008522073 + "k1": 0.8750137053045284, + "k1L": 0.13125205579567925 }, "SINSB03.MQUA130": { - "k1": -0.8783523926247634, - "k1L": -0.1317528588937145 + "k1": -0.8715614149953018, + "k1L": -0.13073421224929527 }, "SINSB03.MQUA230": { - "k1": 1.602307149197639, - "k1L": 0.24034607237964584 + "k1": 1.6106130013389368, + "k1L": 0.2415919502008405 }, "SINSB04.MQUA130": { - "k1": -1.3500247388138074, - "k1L": -0.2025037108220711 + "k1": -1.363887477240887, + "k1L": -0.20458312158613307 }, "SINSB04.MQUA230": { - "k1": 1.4405779393339349, - "k1L": 0.21608669090009022 + "k1": 1.5192268545482268, + "k1L": 0.22788402818223402 }, "SINBC01.MQUA020": { - "k1": 5.00519889662054, - "k1L": 0.7507798344930809 + "k1": 5.0051988744668385, + "k1L": 0.7507798311700258 }, "SINBC01.MQUA050": { - "k1": -1.3552461151807875, - "k1L": -0.20328691727711812 + "k1": -1.3552460259497292, + "k1L": -0.20328690389245938 }, "SINBC01.MQUA070": { - "k1": -0.3830829823122529, - "k1L": -0.05746244734683793 + "k1": -0.3830830345978297, + "k1L": -0.05746245518967445 }, "SINBC01.MQUA090": { - "k1": -2.2877140540419867, - "k1L": -0.343157108106298 + "k1": -2.2877140525712503, + "k1L": -0.34315710788568754 }, "SINBC01.MQUA110": { - "k1": 2.7398322193278624, - "k1L": 0.41097483289917935 + "k1": 2.739832222865398, + "k1L": 0.41097483342980967 }, "SINBC02.MQSK110": { "k1": 0.0, @@ -81,192 +81,192 @@ "k1L": 0.0 }, "SINMA01.MQUA020": { - "k1": -0.7961627981797991, - "k1L": -0.11942441972696985 + "k1": -0.796160745080611, + "k1L": -0.11942411176209164 }, "SINMA01.MQUA030": { - "k1": -0.09733495768948125, - "k1L": -0.014600243653422187 + "k1": -0.0973402324886211, + "k1L": -0.014601034873293164 }, "SINMA01.MQUA050": { - "k1": 0.4372704339548351, - "k1L": 0.06559056509322526 + "k1": 0.43727136307188413, + "k1L": 0.06559070446078262 }, "SINCB01.MQUA230": { - "k1": 1.123954162400301, - "k1L": 0.16859312436004517 + "k1": 1.1239554722667795, + "k1L": 0.1685933208400169 }, "SINCB01.MQUA430": { - "k1": -0.2616716773734951, - "k1L": -0.039250751606024266 + "k1": -0.2616752802877761, + "k1L": -0.039251292043166415 }, "SINDI01.MQUA020": { - "k1": -0.5791944058011749, - "k1L": -0.08687916087017623 + "k1": -0.5791918914752151, + "k1L": -0.08687878372128226 }, "SINDI01.MQSK030": { "k1": 0.0, "k1L": 0.0 }, "SINDI01.MQUA070": { - "k1": 0.12804058818823574, - "k1L": 0.01920608822823536 + "k1": 0.12803905933769652, + "k1L": 0.019205858900654477 }, "SINDI02.MQUA020": { - "k1": -1.2367015115283768, - "k1L": -0.1855052267292565 + "k1": -1.3489159089890062, + "k1L": -0.2023373863483509 }, "SINDI02.MQUA030": { - "k1": 0.8591023785844408, - "k1L": 0.1288653567876661 + "k1": 1.0340874760230605, + "k1L": 0.15511312140345906 }, "SINDI02.MQUA050": { - "k1": -0.03291836183151791, - "k1L": -0.004937754274727687 + "k1": 0.3506594538970562, + "k1L": 0.05259891808455843 }, "SINDI02.MQUA060": { - "k1": 0.18831338822992852, - "k1L": 0.028247008234489276 + "k1": 0.30394534170272214, + "k1L": 0.04559180125540832 }, "SINDI02.MQUA090": { - "k1": -0.07316163385252526, - "k1L": -0.010974245077878789 + "k1": -0.3610969993932116, + "k1L": -0.054164549908981736 }, "S10CB01.MQUA230": { - "k1": 0.8738090627224459, - "k1L": 0.13107135940836687 + "k1": 0.47466278368218734, + "k1L": 0.0711994175523281 }, "S10CB01.MQUA430": { - "k1": -0.4518624473649896, - "k1L": -0.06777936710474844 + "k1": 0.12258962576471828, + "k1L": 0.01838844386470774 }, "S10CB02.MQUA230": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB02.MQUA430": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10DI01.MQUA030": { "k1": 0.0, "k1L": 0.0 }, "S10DI01.MQUA120": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB03.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB03.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB04.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB04.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB05.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB05.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB06.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB06.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB07.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB07.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB08.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB08.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB09.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB09.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB10.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S10CB10.MQUA430": { - "k1": -0.8305860577067146, - "k1L": -0.12458790865600718 + "k1": -0.8305860577067147, + "k1L": -0.12458790865600719 }, "S10CB11.MQUA230": { - "k1": 0.8305803304126477, - "k1L": 0.12458704956189715 + "k1": 0.830580330412648, + "k1L": 0.1245870495618972 }, "S20SY01.MQUA010": { - "k1": -0.757247717713711, - "k1L": -0.11358715765705665 + "k1": -0.7572477177136773, + "k1L": -0.11358715765705159 }, "S20SY01.MQUA030": { - "k1": 1.24057378275979, - "k1L": 0.1860860674139685 + "k1": 1.2405737827596908, + "k1L": 0.18608606741395362 }, "S20SY01.MQUA040": { - "k1": -1.2481349670498976, - "k1L": -0.18722024505748464 + "k1": -1.248134967049847, + "k1L": -0.18722024505747703 }, "S20SY01.MQUA060": { - "k1": 0.27871808261871645, - "k1L": 0.041807712392807464 + "k1": 0.27871808261871167, + "k1L": 0.04180771239280675 }, "S20SY02.MQUA070": { - "k1": 1.5571702267477394, - "k1L": 0.2335755340121609 + "k1": 1.55717, + "k1L": 0.2335755 }, "S20SY02.MQUA100": { - "k1": 0.013736815174708249, - "k1L": 0.002060522276206237 + "k1": 0.013737, + "k1L": 0.00206055 }, "S20SY02.MQUA140": { - "k1": -1.170620890378731, - "k1L": -0.17559313355680964 + "k1": -1.170621, + "k1L": -0.17559314999999998 }, "S20SY02.MQUA180": { - "k1": -0.14094360914972026, - "k1L": -0.02114154137245804 + "k1": -0.140944, + "k1L": -0.0211416 }, "S20BC01.MQUA010": { - "k1": 0.8614405900337658, - "k1L": 0.12921608850506486 + "k1": 0.873603591111957, + "k1L": 0.13104053866679355 }, "S20BC01.MQUA030": { - "k1": -0.8951786461613632, - "k1L": -0.13427679692420447 + "k1": -0.9379972125264844, + "k1L": -0.14069958187897266 }, "S20BC01.MQUA060": { - "k1": 0.8539868563672136, - "k1L": 0.12809802845508203 + "k1": 0.8647707996664207, + "k1L": 0.12971561994996308 }, "S20BC02.MQSK110": { "k1": 0.0, @@ -285,132 +285,132 @@ "k1L": 0.0 }, "S20MA01.MQUA010": { - "k1": -0.3375820257014694, - "k1L": -0.05063730385522041 + "k1": -0.20801880090673047, + "k1L": -0.03120282013600957 }, "S20MA01.MQUA020": { - "k1": -1.030532317546877, - "k1L": -0.15457984763203156 + "k1": -1.171764144178601, + "k1L": -0.17576462162679016 }, "S20MA01.MQUA040": { - "k1": 1.3081693184242171, - "k1L": 0.19622539776363257 + "k1": 1.320901221249259, + "k1L": 0.19813518318738885 }, "S20CB01.MQUA430": { - "k1": 0.3095316613876107, - "k1L": 0.0464297492081416 + "k1": 0.3340241529425683, + "k1L": 0.05010362294138525 }, "S20CB02.MQUA430": { - "k1": 0.4182949696363001, - "k1L": 0.062744245445445 + "k1": 0.4182949696331242, + "k1L": 0.06274424544496862 }, "S20CB03.MQUA430": { - "k1": -0.7121361011408113, - "k1L": -0.10682041517112169 + "k1": -0.7121361011399584, + "k1L": -0.10682041517099376 }, "S20CB04.MQUA430": { - "k1": 0.8147392424110552, - "k1L": 0.12221088636165828 + "k1": 0.8147392424101467, + "k1L": 0.122210886361522 }, "S30CB01.MQUA430": { - "k1": -0.7094285418846946, - "k1L": -0.10641428128270419 + "k1": -0.7094285418856833, + "k1L": -0.10641428128285249 }, "S30CB02.MQUA430": { - "k1": 0.6690212627856271, - "k1L": 0.10035318941784406 + "k1": 0.6690212627857176, + "k1L": 0.10035318941785763 }, "S30CB03.MQUA430": { "k1": -0.7877148024385267, "k1L": -0.118157220365779 }, "S30CB04.MQUA430": { - "k1": 0.7877126388168603, - "k1L": 0.11815689582252903 + "k1": 0.7877126388168609, + "k1L": 0.11815689582252914 }, "S30CB05.MQUA430": { "k1": -0.7877148024385267, "k1L": -0.118157220365779 }, "S30CB06.MQUA430": { - "k1": 0.7877126388168603, - "k1L": 0.11815689582252903 + "k1": 0.7877126388168609, + "k1L": 0.11815689582252914 }, "S30CB07.MQUA430": { "k1": -0.7877148024385267, "k1L": -0.118157220365779 }, "S30CB08.MQUA430": { - "k1": 0.7877126388168603, - "k1L": 0.11815689582252903 + "k1": 0.7877126388168609, + "k1L": 0.11815689582252914 }, "S30CB09.MQUA430": { "k1": -0.7877148024385267, "k1L": -0.118157220365779 }, "S30CB10.MQUA430": { - "k1": 0.7877126388168603, - "k1L": 0.11815689582252903 + "k1": 0.7877126388168609, + "k1L": 0.11815689582252914 }, "S30CB11.MQUA430": { "k1": -0.7877148024385267, "k1L": -0.118157220365779 }, "S30CB12.MQUA430": { - "k1": 0.7877126388168603, - "k1L": 0.11815689582252903 + "k1": 0.7877126388168609, + "k1L": 0.11815689582252914 }, "S30CB13.MQUA430": { - "k1": -0.5106929530384943, - "k1L": -0.07660394295577413 + "k1": -0.507676594003293, + "k1L": -0.07615148910049395 }, "S30CB14.MQUA430": { - "k1": -0.2615424187751576, - "k1L": -0.07846272563254728 + "k1": -0.30449789907398617, + "k1L": -0.09134936972219584 }, "S30CB15.MQUA010": { - "k1": -0.21910246506114095, - "k1L": -0.06573073951834228 + "k1": -0.17009981277881317, + "k1L": -0.05102994383364395 }, "S30CB15.MQUA020": { - "k1": 0.9071774878529978, - "k1L": 0.2721532463558993 + "k1": 0.900363739835595, + "k1L": 0.2701091219506785 }, "S30CB15.MQUA100": { - "k1": -0.20725616868530122, - "k1L": -0.03108842530279518 + "k1": -0.20725616868530256, + "k1L": -0.031088425302795382 }, "S30CB15.MQUA200": { - "k1": -1.036280843426506, - "k1L": -0.1554421265139759 + "k1": -1.0362808434265127, + "k1L": -0.1554421265139769 }, "SARCL01.MQUA020": { - "k1": 0.8369509412082033, - "k1L": 0.25108528236246097 + "k1": 1.0485042112239236, + "k1L": 0.31455126336717704 }, "SARCL01.MQUA050": { - "k1": -1.3931024316627176, - "k1L": -0.41793072949881527 + "k1": -0.8452727407706724, + "k1L": -0.2535818222312017 }, "SARCL01.MQUA080": { - "k1": -0.4215768849694486, - "k1L": -0.1264730654908346 + "k1": -0.4003274763369442, + "k1L": -0.12009824290108326 }, "SARCL01.MQUA100": { - "k1": 1.148551676933231, - "k1L": 0.34456550307996925 + "k1": 0.6199535586235788, + "k1L": 0.18598606758707364 }, "SARCL01.MQUA140": { - "k1": -0.35585508135720445, - "k1L": -0.10675652440716134 + "k1": 1.1619233966505333, + "k1L": 0.34857701899515997 }, "SARCL01.MQUA190": { - "k1": -1.1127351649539319, - "k1L": -0.33382054948617956 + "k1": -1.366953399953986, + "k1L": -0.4100860199861958 }, "SARCL02.MQUA130": { - "k1": 2.470468387349568, - "k1L": 0.7411405162048703 + "k1": 1.8, + "k1L": 0.54 }, "SARCL02.MQUA150": { "k1": 0.0, @@ -421,24 +421,24 @@ "k1L": 0.0 }, "SARCL02.MQUA210": { - "k1": -2.223421548614611, - "k1L": -0.6670264645843833 + "k1": -1.62, + "k1L": -0.486 }, "SARCL02.MQUA250": { - "k1": 1.4772503831463863, - "k1L": 0.44317511494391587 + "k1": 1.9416015335643337, + "k1L": 0.5824804600693001 }, "SARCL02.MQSK300": { "k1": 0.0, "k1L": 0.0 }, "SARCL02.MQUA310": { - "k1": 1.4772503831463863, - "k1L": 0.44317511494391587 + "k1": 1.9416015335643337, + "k1L": 0.5824804600693001 }, "SARCL02.MQUA350": { - "k1": -2.223421548614611, - "k1L": -0.6670264645843833 + "k1": -1.62, + "k1L": -0.486 }, "SARCL02.MQSK420": { "k1": 0.0, @@ -449,28 +449,28 @@ "k1L": 0.0 }, "SARCL02.MQUA460": { - "k1": 2.470468387349568, - "k1L": 0.7411405162048703 + "k1": 1.8, + "k1L": 0.54 }, "SARMA01.MQUA010": { - "k1": -1.650801061098936, - "k1L": -0.4952403183296808 + "k1": -1.6435399681642, + "k1L": -0.49306199044925997 }, "SARMA01.MQUA060": { - "k1": 1.2626093456104128, - "k1L": 0.37878280368312384 + "k1": 1.5481652397872268, + "k1L": 0.464449571936168 }, "SARMA01.MQUA080": { - "k1": -0.6111764200168897, - "k1L": -0.1833529260050669 + "k1": -1.6684096984720258, + "k1L": -0.5005229095416077 }, "SARMA01.MQUA120": { - "k1": 0.8003759866566165, - "k1L": 0.24011279599698493 + "k1": 1.0445451496443325, + "k1L": 0.31336354489329976 }, "SARMA01.MQUA140": { - "k1": -0.8731282680059715, - "k1L": -0.26193848040179146 + "k1": -0.556714038363632, + "k1L": -0.1670142115090896 }, "SARMA02.MQUA050": { "k1": 0.0, @@ -549,12 +549,12 @@ "k1L": -0.18797422953822612 }, "SARUN18.MQUA080": { - "k1": -0.8797988336635323, - "k1L": -0.07038390669308259 + "k1": -0.2275965827509157, + "k1L": -0.018207726620073257 }, "SARUN19.MQUA080": { - "k1": 1.2357896696606743, - "k1L": 0.09886317357285394 + "k1": 0.9970832678636612, + "k1L": 0.0797666614290929 }, "SARUN20.MQUA220": { "k1": 0.8363412365675689, @@ -569,20 +569,20 @@ "k1L": -0.16799985830701 }, "SATSY01.MQUA020": { - "k1": 1.4484893396881076, - "k1L": 0.43454680190643225 + "k1": 1.5148580412102386, + "k1L": 0.4544574123630716 }, "SATSY01.MQSK040": { "k1": 0, "k1L": 0.0 }, "SATSY01.MQUA050": { - "k1": -2.0274785203726586, - "k1L": -0.6082435561117976 + "k1": -2.519230530479981, + "k1L": -0.7557691591439943 }, "SATSY01.MQUA080": { - "k1": 2.7404365262243173, - "k1L": 0.8221309578672952 + "k1": 2.2866664735587365, + "k1L": 0.6859999420676209 }, "SATSY01.MQSK100": { "k1": 0, @@ -593,120 +593,128 @@ "k1L": -0.255 }, "SATSY02.MQUA010": { - "k1": -0.6821763173715946, - "k1L": -0.20465289521147836 + "k1": 0.8441269487029979, + "k1L": 0.25323808461089936 }, "SATSY02.MQUA210": { - "k1": 2.134672331438511, - "k1L": 0.6404016994315532 + "k1": 3.521141, + "k1L": 1.0563423 }, "SATSY02.MQUA230": { - "k1": -2.0773305941557147, - "k1L": -0.3115995891233572 + "k1": -3.756948, + "k1L": -0.5635422 }, "SATSY02.MQUA240": { - "k1": -0.880473149790741, - "k1L": -0.13207097246861113 + "k1": 3.243975, + "k1L": 0.48659624999999995 }, "SATSY02.MQUA260": { - "k1": 1.1399325701549154, - "k1L": 0.34197977104647465 + "k1": 2.887369, + "k1L": 0.8662107 }, "SATSY02.MQUA300": { - "k1": 1.7158353138082787, - "k1L": 0.2573752970712418 + "k1": 1.715835, + "k1L": 0.25737525 }, "SATSY02.MQUA310": { - "k1": -2.128331530770358, - "k1L": -0.3192497296155537 + "k1": -2.128332, + "k1L": -0.3192498 }, "SATSY02.MQUA330": { - "k1": 1.6250098827046713, - "k1L": 0.2437514824057007 + "k1": 1.62501, + "k1L": 0.2437515 }, "SATSY02.MQUA340": { - "k1": -1.2858555335337565, - "k1L": -0.19287833003006347 + "k1": -1.285856, + "k1L": -0.1928784 }, "SATSY03.MQUA130": { - "k1": 1.7543731778732023, - "k1L": 0.5263119533619607 + "k1": 0.1714116893143215, + "k1L": 0.05142350679429645 }, "SATSY03.MQUA220": { - "k1": -2.2597, - "k1L": -0.338955 + "k1": 0.0, + "k1L": 0.0 }, "SATSY03.MQUA310": { - "k1": 1.687888, - "k1L": 0.2531832 + "k1": 0.0, + "k1L": 0.0 }, "SATSY03.MQUA430": { - "k1": 0.271288, - "k1L": 0.04069319999999999 + "k1": 0.0, + "k1L": 0.0 + }, + "SATBC01.MQUA320": { + "k1": 0.0, + "k1L": 0.0 + }, + "SATBC01.MQSK330": { + "k1": 0, + "k1L": 0.0 }, "SATBC01.MQUA410": { - "k1": -0.9172132414861169, - "k1L": -0.13758198622291753 + "k1": 0.0, + "k1L": 0.0 }, "SATBC01.MQUA430": { - "k1": -0.4876120549606805, - "k1L": -0.07314180824410207 + "k1": 0.0, + "k1L": 0.0 }, "SATBC01.MQUA450": { - "k1": 1.4572117236379425, - "k1L": 0.43716351709138274 + "k1": 0.0, + "k1L": 0.0 }, "SATBC01.MQUA470": { - "k1": -0.5822068893721547, - "k1L": -0.0873310334058232 + "k1": 0.0, + "k1L": 0.0 }, "SATCL01.MQUA120": { - "k1": -1.375583136351558, - "k1L": -0.2063374704527337 + "k1": -1.118724117945165, + "k1L": -0.16780861769177474 }, "SATCL01.MQSK125": { "k1": 0, "k1L": 0.0 }, "SATCL01.MQUA130": { - "k1": 1.7683450540271897, - "k1L": 0.2652517581040784 + "k1": 1.7396881510195779, + "k1L": 0.2609532226529367 }, "SATCL01.MQUA180": { - "k1": 1.7535539061493717, - "k1L": 0.26303308592240576 + "k1": 0.0, + "k1L": 0.0 }, "SATCL01.MQUA190": { - "k1": -1.3556482575136144, - "k1L": -0.20334723862704215 + "k1": 0.0, + "k1L": 0.0 }, "SATDI01.MQUA025": { - "k1": -0.15984, - "k1L": -0.023976 + "k1": 0.0, + "k1L": 0.0 }, "SATDI01.MQUA080": { - "k1": 1.1536102494185194, - "k1L": 0.17304153741277792 + "k1": 0.0, + "k1L": 0.0 }, "SATDI01.MQUA220": { - "k1": -0.07789529582699475, - "k1L": -0.011684294374049213 + "k1": 0.0, + "k1L": 0.0 }, "SATDI01.MQUA230": { - "k1": -1.7150605908116299, - "k1L": -0.25725908862174446 + "k1": 0.0, + "k1L": 0.0 }, "SATDI01.MQUA250": { - "k1": 1.0538146063347473, - "k1L": 0.1580721909502121 + "k1": 0.0, + "k1L": 0.0 }, "SATCB01.MQUA230": { - "k1": 0.9708836330621832, - "k1L": 0.14563254495932748 + "k1": 0.0, + "k1L": 0.0 }, "SATCB01.MQUA430": { - "k1": -1.3865105313160038, - "k1L": -0.20797657969740055 + "k1": 0.0, + "k1L": 0.0 }, "SATCB02.MQUA230": { "k1": 1.3, @@ -721,48 +729,48 @@ "k1L": 0.195 }, "SATCB03.MQUA430": { - "k1": -1.3049869499732545, - "k1L": -0.19574804249598818 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA120": { - "k1": 1.522544858086669, - "k1L": 0.12180358864693352 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA140": { - "k1": 0.5649676471971448, - "k1L": 0.04519741177577158 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA160": { - "k1": -0.2207608645116997, - "k1L": -0.01766086916093598 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA180": { - "k1": -3.335623045630746, - "k1L": -0.26684984365045966 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA230": { - "k1": 1.5760499114367064, - "k1L": 0.12608399291493652 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA250": { - "k1": 1.1517943270914826, - "k1L": 0.09214354616731861 + "k1": 0.0, + "k1L": 0.0 }, "SATMA01.MQUA610": { - "k1": -1.2185071403550352, - "k1L": -0.18277607105325527 + "k1": -1.2185071393832552, + "k1L": -0.18277607090748826 }, "SATMA01.MQUA630": { - "k1": 1.3816871025856692, - "k1L": 0.20725306538785038 + "k1": 1.3816870987354146, + "k1L": 0.2072530648103122 }, "SATMA01.MQUA640": { - "k1": 1.3544548860425167, - "k1L": 0.2031682329063775 + "k1": 1.3544548891358774, + "k1L": 0.20316823337038162 }, "SATUN04.MQUA060": { - "k1": -2.5934331387813065, - "k1L": -0.20747465110250451 + "k1": -2.5934331389356884, + "k1L": -0.20747465111485508 }, "SATUN05.MQUA420": { "k1": -0.930202, @@ -837,20 +845,20 @@ "k1L": 0.32640333814336475 }, "SATUN23.MQUA080": { - "k1": 2.0014646739689153, - "k1L": 0.16011717391751323 + "k1": 0.0, + "k1L": 0.0 }, "SATUN24.MQUA080": { - "k1": 1.7512020268945026, - "k1L": 0.1400961621515602 + "k1": 0.0, + "k1L": 0.0 }, "SATUN25.MQUA080": { - "k1": -3.7825396605465373, - "k1L": -0.302603172843723 + "k1": 0.0, + "k1L": 0.0 }, "SATUN26.MQUA080": { - "k1": 2.7254694701252795, - "k1L": 0.21803755761002236 + "k1": 0.0, + "k1L": 0.0 }, "SATBD01.MQUA010": { "k1": 0.5069789237265826, @@ -1003,36 +1011,40 @@ "k2L": 0.0 }, "SARCL02.MSEX255": { - "k2": 89.4263049428114, - "k2L": 7.154104395424912 + "k2": 779.1283113453823, + "k2L": 62.330264907630585 }, "SARCL02.MSEX305": { - "k2": 89.4263049428114, - "k2L": 7.154104395424912 + "k2": 779.1283113453823, + "k2L": 62.330264907630585 }, "SATSY01.MSEX030": { - "k2": 59.83941175316537, - "k2L": 4.78715294025323 + "k2": 69.8584896019005, + "k2L": 5.58867916815204 }, "SATSY01.MSEX090": { - "k2": -258.7329652884919, - "k2L": -20.698637223079356 + "k2": -109.51205543384211, + "k2L": -8.760964434707368 }, "SATSY03.MSEX110": { - "k2": 45.11078903135598, - "k2L": 3.6088631225084784 + "k2": 5.710044360549549, + "k2L": 0.45680354884396396 }, "SATSY03.MSEX140": { - "k2": 56.187436250701566, - "k2L": 4.494994900056126 + "k2": 83.73761512845624, + "k2L": 6.6990092102764995 + }, + "SATBC01.MSEX310": { + "k2": 0.0, + "k2L": 0.0 }, "SATCL01.MSEX110": { - "k2": 59.97761925738395, - "k2L": 4.798209540590716 + "k2": 0.0, + "k2L": 0.0 }, "SATCL01.MSEX160": { - "k2": -58.4629710395981, - "k2L": -4.677037683167848 + "k2": 0.0, + "k2L": 0.0 }, "SPOSY01.MSEX020": { "k2": 0, @@ -1982,23 +1994,23 @@ }, "S20SY02.MKDC010": { "cory": 0, - "design_kick": 0.00022426070829185702 + "design_kick": 0.0 }, "S20SY02.MKAC020": { "cory": 0, - "design_kick": 0.00033639106243778553 + "design_kick": 0.0 }, "S20SY02.MKDC030": { "cory": 0, - "design_kick": 0.00022426070829185702 + "design_kick": 0.0 }, "S20SY02.MKAC040": { "cory": 0, - "design_kick": 0.00033639106243778553 + "design_kick": 0.0 }, "S20SY02.MKDC050": { "cory": 0, - "design_kick": 0.00022426070829185702 + "design_kick": 0.0 }, "S30CB15.MKDC030": { "cory": 0,