From e20b9772f6b39cca1ef349715372ae22d3e7a1c8 Mon Sep 17 00:00:00 2001 From: Sven Date: Mon, 26 Jan 2026 15:54:01 +0100 Subject: [PATCH] Improving reference optics for current phase --- .idea/.gitignore | 8 + .../Current/Reference-SwissFEL/initTwiss.madx | 7 +- .../Reference-SwissFEL/matchAramis.madx | 20 +- .../Reference-SwissFEL/matchAthos.madx | 23 +- .../Reference-SwissFEL/matchInjector.madx | 23 +- .../Current/Reference-SwissFEL/settings.json | 488 +++++++++--------- Scripts/Final/SFPlus/initTwiss.madx | 1 - issues.txt | 2 + 8 files changed, 303 insertions(+), 269 deletions(-) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/Scripts/Current/Reference-SwissFEL/initTwiss.madx b/Scripts/Current/Reference-SwissFEL/initTwiss.madx index 4dd64a4..b4ec028 100644 --- a/Scripts/Current/Reference-SwissFEL/initTwiss.madx +++ b/Scripts/Current/Reference-SwissFEL/initTwiss.madx @@ -11,7 +11,10 @@ twissee: beta0, betx=7,bety=30,alfx=0.5,alfy=1.5; ! label: EEHG location: satma twissAT2: beta0, betx=50,bety=50,alfx=0.0,alfy=0; ! label: Athos XTCAV location: satbd01.mqua010$start twissL3: beta0, betx = 8.83, alfx = 0.548, bety = 30.44, alfy = -1.866; ! label: Linac 3 location:s30cb10.mqua430$start twissARECOL:beta0, betx = 2.304, alfx = -1.4045, bety = 25.929, alfy = -6.363; ! label: Aramis ECOL location:sarma01.mqua010$start - ! variables leakdisp = 0; ! Description: Leaked dispersion in SATSY01 to control R56 of switchyard -ECOLasBC = 0; ! Description: Flag to configure Aramis Energy collimator as a bunch compressor \ No newline at end of file +ECOLasBC = 0; ! Description: Flag to configure Aramis Energy collimator as a bunch compressor +! filters for updates +filter1 = 's[i1].*k[12]|s20cb.*k1|s20sy01.*k1'; ! filter: Injector +filter2 = 'sat.*mqua.*k1|sat.*msex.*k2|s20sy02.*m[kq]'; ! filter: Athos +filter3 = 's[3a][0r].*k[12]|s20sy03.*k1'; ! filter: Aramis \ No newline at end of file diff --git a/Scripts/Current/Reference-SwissFEL/matchAramis.madx b/Scripts/Current/Reference-SwissFEL/matchAramis.madx index b1acea4..0950c4c 100644 --- a/Scripts/Current/Reference-SwissFEL/matchAramis.madx +++ b/Scripts/Current/Reference-SwissFEL/matchAramis.madx @@ -16,7 +16,7 @@ S20SY02.MKDC050.cory := 0; s30cb01.mqua430.k1 := 0.8168941546; s30cb02.mqua430.k1 := -0.8168914699; muLin3=0.1883; - +Print,text='MATCH POINT: FODO - Linac 3'; match,SEQUENCE=swissfel,range=s30cb01$start/s30cb03$start; Vary,name=S30CB01.MQUA430.k1,step=0.0001; Vary,name=S30CB02.MQUA430.k1,step=0.0001; @@ -49,7 +49,7 @@ nbety=table(twiss,s30cb02$end,bety); nalfy=table(twiss,s30cb02$end,alfy); -use,sequence=swissfel; +Print,text='MATCH POINT: Match into FODO - Linac 3'; MATCH,SEQUENCE=swissfel,range=s20SY02$start/s30cb01$end,beta0=twisssep; VARY,NAME=s20sy03.mqua020.k1,STEP=0.0001,lower=-2.2,upper=2.2; VARY,NAME=s20sy03.mqua030.k1,STEP=0.0001,lower=-2.2,upper=2.2; @@ -66,6 +66,7 @@ ENDMATCH; use,sequence=swissfel; +Print,text='MATCH POINT: Match for Emittance Measurement in Linac 3'; MATCH,SEQUENCE=swissfel,range=s20SY02$start/s30cb12$end,beta0=twisssep; VARY,NAME=s30cb06.mqua430.k1,STEP=0.0001; VARY,NAME=s30cb07.mqua430.k1,STEP=0.0001; @@ -89,7 +90,7 @@ plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100; if (ECOLasBC ==0.) { sarcl02.mqua130.k1=1.8; R56 = -000e-6; - + Print,text='MATCH POINT: Match R56 of Energy Collimator'; MATCH,RMATRIX,SEQUENCE=swissfel,range=SARCL02$START/SARCL02$END,betx=10,alfx=0,bety=10,alfy=0; VARY,NAME=sarcl02.mqua130.k1,STEP=0.0001; CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.mqua210,re56=R56*0.5; @@ -99,6 +100,7 @@ if (ECOLasBC ==0.) { sarcl02.mqua210.k1=-sarcl02.mqua130.k1*0.9; sarcl02.mqua250.k1= sarcl02.mqua130.k1; + Print,text='MATCH POINT: Close Dispersion in Energy Collimator'; MATCH,SEQUENCE=swissfel,range=SARCL02$START/SARCL02$END,betx=10,alfx=0,bety=10,alfy=0; VARY,NAME=sarcl02.mqua250.k1,STEP=0.0001; CONSTRAINT,SEQUENCE=swissfel,range=sarcl02.dbpm260$end,dpx=0; @@ -129,7 +131,7 @@ if (ECOLasBC ==0.) { sarcl02.msex255.k2:=110; sarcl02.msex305.k2:=110; - + Print,text='MATCH POINT: Sextupoles in Energy Collimator'; MATCH,chrom,SEQUENCE=sarcl02,range=#s/#e,betx=nbetx,alfx=nalfx,bety=nbety,alfy=nalfy; VARY,NAME=ecol_k2,STEP=0.0001; CONSTRAINT,SEQUENCE=Sarcl02,range=#e,ddx=0; @@ -178,6 +180,7 @@ 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; VARY,NAME=sarcl01.mqua050.k1,STEP=0.0001; @@ -217,6 +220,7 @@ muAR=0.15; sarun03.mqua080.k1 := -1.699673315; sarun04.mqua080.k1 := 1.746074065; +Print,text='MATCH POINT: FODO - Aramis'; match,SEQUENCE=swissfel,range=sarun03$start/sarun04$end; Vary,name=sarun03.mqua080.k1,step=0.0001; Vary,name=sarun04.mqua080.k1,step=0.0001; @@ -233,8 +237,8 @@ nbety=table(twiss,sarun04$end,bety); nalfy=table(twiss,sarun04$end,alfy); -sarma02.mqua050.k1=sarun03.mqua080.k1*0.5; -sarma02.mqua120.k1=sarun04.mqua080.k1; +sarma02.mqua050.k1=sarun03.mqua080.k1*0; +sarma02.mqua120.k1=sarun04.mqua080.k1*0.5; sarun01.mqua080.k1=sarun03.mqua080.k1; sarun02.mqua080.k1=sarun04.mqua080.k1; @@ -249,7 +253,7 @@ sarma01.mqua120.k1 := -0.18956644741333395; sarma01.mqua140.k1 := 0.5634249743213624; - +Print,text='MATCH POINT: Match into FODO - Aramis'; MATCH,SEQUENCE=swissfel,range=s20SY02$start/sarun06$start,beta0=twisssep; VARY,NAME=sarma01.mqua010.k1,STEP=0.0001; VARY,NAME=sarma01.mqua060.k1,STEP=0.0001; @@ -286,7 +290,7 @@ sarun20.mqua080.k1=sarun04.mqua080.k1; sarbd01.mqua020.k1=0; - +Print,text='MATCH POINT: Match into Beam Dump'; match,sequence=swissfel,range=s20SY02$start/satbd02$end,beta0=twisssep; vary,name=sarun19.mqua080.k1,step=0.0001,lower=-3,upper=3; vary,name=sarun20.mqua080.k1,step=0.0001,lower=-3,upper=3; diff --git a/Scripts/Current/Reference-SwissFEL/matchAthos.madx b/Scripts/Current/Reference-SwissFEL/matchAthos.madx index 8224c5b..7ce14d4 100644 --- a/Scripts/Current/Reference-SwissFEL/matchAthos.madx +++ b/Scripts/Current/Reference-SwissFEL/matchAthos.madx @@ -22,6 +22,7 @@ S20SY02.MQUA140.k1= 1.042013352497239; S20SY02.MQUA180.k1= -1.2175949038409828; use,sequence=swissfel; +Print,text='MATCH POINT: Match Kicker strength of Septum'; MATCH,SEQUENCE=swissfel,range=s20sy02$start/s20sy02$end,beta0=twisssep; VARY,NAME=s20sy02.mqua070.k1,STEP=0.0001,lower=-3,upper=3; VARY,NAME=s20sy02.mqua100.k1,STEP=0.0001,lower=-3,upper=3; @@ -49,6 +50,7 @@ satsy01.mqua090.k1 := -0.826; kmin=-2.1; kmax=2.1; +Print,text='MATCH POINT: Match Dispersion Symmetry Point in SATSY01'; MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; VARY, NAME=satsy01.mqua020.k1, STEP=0.00001,LOWER=0,UPPER=4; VARY, NAME=satsy01.mqua040.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; @@ -72,7 +74,7 @@ satsy01.mqua300.k1 := 5.27400e-01; - +Print,text='MATCH POINT: Close Dispersion in X for SATSY01'; MATCH,SEQUENCE=swissfel,range=s20SY02$start/satcl01$end,beta0=twisssep; VARY, NAME=satsy01.mqua230.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; VARY, NAME=satsy01.mqua210.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; @@ -97,7 +99,7 @@ satsy02.mqua010.k1 := -1.8649770138303619; satsy02.mqua110.k1 := 2.09998; satsy02.mqua120.k1 := -1.3492181718919152; - +Print,text='MATCH POINT: Close Dispersion in Y for SATSY02'; 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; @@ -117,7 +119,7 @@ satcl01.mqua180.k1:=satcl012; satcl01.mqua190.k1:=satcl011; - +Print,text='MATCH POINT: Symmetric 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; @@ -127,6 +129,7 @@ LMDIF, CALLS=1000, TOLERANCE=1.E-21; ENDMATCH; +Print,text='MATCH POINT: Match into SATCL01'; MATCH,SEQUENCE=swissfel,range=#s/#e,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; @@ -144,6 +147,7 @@ LMDIF, CALLS=1000, TOLERANCE=1.E-21; ENDMATCH; +Print,text='MATCH POINT: Close Dispersion for Switchyard'; MATCH, SEQUENCE=swissfel, range=s20SY02$start/satcl01$end,beta0=twisssep; VARY, NAME= satcl01.mqua180.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; VARY, NAME= satcl01.mqua190.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; @@ -167,7 +171,7 @@ muATL := 0.053; satcb01.mqua230.k1 := 0.490961973; satcb01.mqua430.k1 := -0.490511125; - +Print,text='MATCH POINT: FODO - SATCB01'; match,SEQUENCE=swissfel,range=satcb01$start/satcb01$end; Vary,name=SatCB01.MQUA230.k1,step=0.0001; Vary,name=SatCB01.MQUA430.k1,step=0.0001; @@ -190,7 +194,7 @@ nalfy=table(twiss,satcb01$end,alfy); !--------------------------------------- ! match to reference point at satdi01-mqua250 - +Print,text='MATCH POINT: Match to SATDI01'; MATCH, SEQUENCE=swissfel,range=s20sy02$start/satma01$start,beta0=twisssep; VARY,NAME=satdi01.mqua025.k1,STEP=0.0001,lower=-2.0,upper=2.0; VARY,NAME=satdi01.mqua080.k1,STEP=0.0001,lower=-2.0,upper=2.0; @@ -207,7 +211,7 @@ ENDMATCH; !------------------------------------ ! match into SATCB01 - +Print,text='MATCH POINT: Match into Athos C-Band Linac'; MATCH, SEQUENCE=swissfel,range=s20sy02$start/satcl02$end,beta0=twisssep; VARY,NAME=satdi01.mqua250.k1,STEP=0.0001,lower=-1.8,upper=1.8; VARY,NAME=satdi01.mqua260.k1,STEP=0.0001,lower=-1.8,upper=1.8; @@ -232,6 +236,7 @@ pol=-1; satun06.mqua080.k1 := -1.699673315*pol; satun07.mqua080.k1 := 1.746074065*pol; muAT=0.14; +Print,text='MATCH POINT: FODO - Athos'; match,SEQUENCE=swissfel,range=satun06$start/satun07$end; Vary,name=satun06.mqua080.k1,step=0.0001; Vary,name=satun07.mqua080.k1,step=0.0001; @@ -268,7 +273,7 @@ ATalfy=table(twiss,satun07$end,alfy); - +Print,text='MATCH POINT: Match into FODO - Athos'; MATCH, SEQUENCE=swissfel,range=satma01.mqua250$end/satun07$end,beta0=twissee; VARY,NAME=satma01.mqua610.k1,STEP=0.0001,lower=-2.0,upper=2.0; VARY,NAME=satma01.mqua630.k1,STEP=0.0001,lower=-2.0,upper=2.0; @@ -291,7 +296,7 @@ plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100; satma01.mqua050.k1 = 1.; - +Print,text='MATCH POINT: Match into EEHG Section'; MATCH, SEQUENCE=swissfel,range=s20sy02$start/satma01$end,beta0=twisssep; VARY,NAME=satma01.mqua050.k1,STEP=0.0001,lower=-3.8,upper=3.8; VARY,NAME=satma01.mqua120.k1,STEP=0.0001,lower=-3.8,upper=3.8; @@ -315,7 +320,7 @@ CONSTRAINT,SEQUENCE=swissFEL,range=satma01.mqua180$start, bety <70; LMDIF,CALLS=1000,TOLERANCE=1.e-21; ENDMATCH; - +Print,text='MATCH POINT: Match into Athos TCAV'; MATCH, SEQUENCE=swissfel,range=s20sy02$start/satbd01$end,beta0=twisssep; VARY,NAME=satun22.mqua080.k1,STEP=0.0001,lower=-5.0,upper=5.0; VARY,NAME=satma02.mqua010.k1,STEP=0.0001,lower=-5.0,upper=5.0; diff --git a/Scripts/Current/Reference-SwissFEL/matchInjector.madx b/Scripts/Current/Reference-SwissFEL/matchInjector.madx index a69c03b..0a8ea61 100644 --- a/Scripts/Current/Reference-SwissFEL/matchInjector.madx +++ b/Scripts/Current/Reference-SwissFEL/matchInjector.madx @@ -1,7 +1,7 @@ ! matching scripts for SwissFEL reference ! into laser heater - +Print,text='MATCH POINT: Match through laser heater'; MATCH,SEQUENCE=SwissFEL,range=#s/sinbc02$start,beta0 = Twiss0; VARY,NAME=sinlh01.MQUA020.k1,STEP=0.0001; VARY,NAME=sinlh01.MQUA040.k1,STEP=0.0001; @@ -27,6 +27,7 @@ ENDMATCH; sinsb04.mqua130.k1 :=0.7219189344; sinsb04.mqua230.k1 :=-0.71562666978; muInj := 0.1; +Print,text='MATCH POINT: FODO - Injector'; MATCH,SEQUENCE=swissfel,range=sinsb04$start/sinsb04$end; VARY,NAME=sinsb04.MQUA130.k1,STEP=0.0001,lower=-2.5,upper=2.5; VARY,NAME=sinsb04.MQUA230.k1,STEP=0.0001,lower=-2.5,upper=2.5; @@ -52,7 +53,7 @@ SINLH03.MQUA080.k1= -3.30357388716279; SINSB03.MQUA130.k1= 1.705920260985911; SINSB03.MQUA230.k1= -1.1958386267066743; - +Print,text='MATCH POINT: Match into FODO - Injector'; MATCH,SEQUENCE=SwissFEL,range=#s/sinsb04$end,beta0 = Twiss0; VARY,NAME=sinlh02.MQUA410.k1,STEP=0.0001,lower=-3.5,upper=3.5; VARY,NAME=sinlh03.MQUA030.k1,STEP=0.0001,lower=-3.5,upper=3.5; @@ -83,6 +84,9 @@ plot,haxis=s,vaxis=betx,bety,colour=100; sinsb05.mqua130.k1 := sinsb04.mqua130.k1; sinsb05.mqua230.k1 := sinsb04.mqua230.k1; + + +Print,text='MATCH POINT: Match through BC1'; MATCH,SEQUENCE=SwissFEL,range=#s/sindi02$end,beta0=twiss0; VARY,NAME=sinbc01.mqua020.k1,STEP=0.0001,lower=-3.5,upper=3.5; VARY,NAME=sinbc01.mqua050.k1,STEP=0.0001,lower=-3.5,upper=3.5; @@ -119,7 +123,7 @@ muLin1 := 0.1883; s10cb02.mqua230.k1 := -1.490961973; s10cb02.mqua430.k1 := 1.490511125; - +Print,text='MATCH POINT: FODO - Linac 1'; MATCH,SEQUENCE=swissfel,range=s10cb02$start/s10cb02$end; VARY,NAME=s10cb02.MQUA230.k1,STEP=0.0001,lower=-2.5,upper=2.5; VARY,NAME=s10cb02.MQUA430.k1,STEP=0.0001,lower=-2.5,upper=2.5; @@ -158,7 +162,7 @@ S10CB09.MQUA230.k1 :=S10CB02.MQUA430.k1; ! match into Linac 1st sindi02.mqua020.k1=-1; - +Print,text='MATCH POINT: Match into FODO - Linac 1'; MATCH,SEQUENCE=SwissFEL,range=#s/s10cb02$end,beta0=twiss0; VARY,NAME=sindi02.mqua020.k1,STEP=0.0001,lower=-5.5,upper=5.5; VARY,NAME=sindi02.mqua030.k1,STEP=0.0001,lower=-5.5,upper=5.5; @@ -185,7 +189,8 @@ twiss,sequence=SwissFEL,range=#s/S10BC01$start,beta0=twiss0; plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100; -USE,SEQUENCE=SwissFEL; + +Print,text='MATCH POINT: Match before BC2'; MATCH,SEQUENCE=SwissFEL,range=#s/s20cb01$start,beta0=twiss0; VARY,NAME=s10cb07.mqua430.k1,STEP=0.0001,lower=-2.5,upper=2.5; VARY,NAME=s10cb08.mqua230.k1,STEP=0.0001,lower=-2.5,upper=2.5; @@ -205,7 +210,8 @@ ENDMATCH; -USE,SEQUENCE=SwissFEL; + +Print,text='MATCH POINT: Match through BC2'; MATCH,SEQUENCE=SwissFEL,range=#s/s20cb01$start,beta0 = twiss0; VARY,NAME=s10bc01.mqua020.k1,STEP=0.0001,lower=-2.5,upper=2.5; VARY,NAME=s10bc01.mqua040.k1,STEP=0.0001,lower=-2.5,upper=2.5; @@ -231,6 +237,7 @@ s20cb02.mqua430.k1 = 0.8156479879; muLin2=0.2; +Print,text='MATCH POINT: FODO - Linac 2'; match,SEQUENCE=swissfel,range=s20cb01$start/s20cb02$end; Vary,name=S20CB01.MQUA430.k1,step=0.0001; Vary,name=S20CB02.MQUA430.k1,step=0.0001; @@ -252,7 +259,7 @@ nalfy=table(twiss,s20cb02$end,alfy); !-------------------------------- ! Linac Bunch Compressor and matching into Linac 2 - +Print,text='MATCH POINT: Match into FODO - Linac 2'; MATCH,SEQUENCE=swissfel,beta0=twiss0; VARY,NAME=s10ma01.mqua020.k1,STEP=0.0001,lower=-2.4,upper=2.4; VARY,NAME=s10ma01.mqua050.k1,STEP=0.0001,lower=-2.4,upper=2.4; @@ -276,7 +283,7 @@ S20SY01.MQUA030.k1= 1.6527516900200674; S20SY01.MQUA050.k1= -1.2455405678473916; S20SY01.MQUA080.k1= 1.3915642831470632; - +Print,text='MATCH POINT: Match before Switchyard'; MATCH,SEQUENCE=SwissFEL,range=#s/s20sy02$start,beta0 = Twiss0; VARY,NAME=s20sy01.mqua020.k1,STEP=0.0001,lower=-2.2,upper=2.2; VARY,NAME=s20sy01.mqua030.k1,STEP=0.0001,lower=-2.2,upper=2.2; diff --git a/Scripts/Current/Reference-SwissFEL/settings.json b/Scripts/Current/Reference-SwissFEL/settings.json index af37f18..184c615 100644 --- a/Scripts/Current/Reference-SwissFEL/settings.json +++ b/Scripts/Current/Reference-SwissFEL/settings.json @@ -17,92 +17,92 @@ "k1L": 0.0 }, "SINLH01.MQUA020": { - "k1": 1.024587447807864, - "k1L": 0.1536881171711796 + "k1": 0.48606588617674473, + "k1L": 0.07290988292651171 }, "SINLH01.MQSK030": { "k1": 0.0, "k1L": 0.0 }, "SINLH01.MQUA040": { - "k1": -2.800892875568927, - "k1L": -0.420133931335339 + "k1": 0.96721, + "k1L": 0.1450815 }, "SINLH01.MQUA050": { - "k1": 2.599572, - "k1L": 0.3899358 + "k1": -2.765914947401149, + "k1L": -0.41488724211017236 }, "SINLH01.MQUA070": { - "k1": -3.5596842967067936, - "k1L": -0.533952644506019 + "k1": -1.370525813148873, + "k1L": -0.20557887197233093 }, "SINLH02.MQUA010": { - "k1": 3.076494684743793, - "k1L": 0.4614742027115689 + "k1": 3.045012988722264, + "k1L": 0.45675194830833954 }, "SINLH02.MQUA410": { - "k1": -1.1004699049013937, - "k1L": -0.16507048573520905 + "k1": -1.1004699049862536, + "k1L": -0.16507048574793803 }, "SINLH03.MQUA030": { - "k1": 1.214540293254702, - "k1L": 0.1821810439882053 + "k1": 1.2145402932737954, + "k1L": 0.1821810439910693 }, "SINLH03.MQUA040": { - "k1": 2.3655916310830505, - "k1L": 0.3548387446624576 + "k1": 2.365591631161917, + "k1L": 0.35483874467428755 }, "SINLH03.MQUA060": { - "k1": -1.8720927342603897, - "k1L": -0.28081391013905843 + "k1": -1.8720927341980749, + "k1L": -0.28081391012971124 }, "SINLH03.MQUA080": { - "k1": -3.30357388716279, - "k1L": -0.4955360830744185 + "k1": -3.303573887183919, + "k1L": -0.4955360830775878 }, "SINSB03.MQUA130": { - "k1": 1.705920260985911, - "k1L": 0.25588803914788666 + "k1": 1.7059202609861521, + "k1L": 0.2558880391479228 }, "SINSB03.MQUA230": { - "k1": -1.1958386267066743, - "k1L": -0.17937579400600115 + "k1": -1.1958386266789554, + "k1L": -0.1793757940018433 }, "SINSB04.MQUA130": { - "k1": 0.7084748994661484, - "k1L": 0.10627123491992226 + "k1": 0.7084748994661481, + "k1L": 0.1062712349199222 }, "SINSB04.MQUA230": { - "k1": -0.7081053976736004, - "k1L": -0.10621580965104005 + "k1": -0.7081053976736001, + "k1L": -0.10621580965104002 }, "SINSB05.MQUA130": { - "k1": 0.7084748994661484, - "k1L": 0.10627123491992226 + "k1": 0.7084748994661481, + "k1L": 0.1062712349199222 }, "SINSB05.MQUA230": { - "k1": -0.7081053976736004, - "k1L": -0.10621580965104005 + "k1": -0.7081053976736001, + "k1L": -0.10621580965104002 }, "SINBC01.MQUA020": { - "k1": -0.12096332713809765, - "k1L": -0.018144499070714647 + "k1": 0.035868, + "k1L": 0.005380199999999999 }, "SINBC01.MQUA050": { - "k1": 1.1686498041231852, - "k1L": 0.17529747061847778 + "k1": 0.006343, + "k1L": 0.00095145 }, "SINBC01.MQUA070": { - "k1": -0.701411699959606, - "k1L": -0.10521175499394089 + "k1": 0.008458, + "k1L": 0.0012687 }, "SINBC01.MQUA090": { - "k1": -2.195156537366061, - "k1L": -0.32927348060490913 + "k1": 0.005479, + "k1L": 0.0008218500000000001 }, "SINBC01.MQUA110": { - "k1": 1.877905180026483, - "k1L": 0.28168577700397246 + "k1": 0.579057, + "k1L": 0.08685855 }, "SINBC02.MQSK110": { "k1": 0.0, @@ -121,132 +121,132 @@ "k1L": 0.0 }, "SINDI01.MQUA020": { - "k1": -1.6121171239740122, - "k1L": -0.24181756859610182 + "k1": 0.053767, + "k1L": 0.00806505 }, "SINDI01.MQSK030": { "k1": 0.0, "k1L": 0.0 }, "SINDI01.MQUA070": { - "k1": 1.6506394324573792, - "k1L": 0.24759591486860688 + "k1": -0.147298, + "k1L": -0.022094700000000002 }, "SINDI02.MQUA020": { - "k1": -1.329908204951412, - "k1L": -0.1994862307427118 + "k1": -1.1155488329545424, + "k1L": -0.16733232494318137 }, "SINDI02.MQUA030": { - "k1": 1.5931099616301614, - "k1L": 0.2389664942445242 + "k1": -0.04300458177230275, + "k1L": -0.006450687265845413 }, "SINDI02.MQUA050": { - "k1": -1.0692970307411889, - "k1L": -0.16039455461117832 + "k1": 1.1682738476872743, + "k1L": 0.17524107715309115 }, "SINDI02.MQUA060": { - "k1": 0.7054587242950474, - "k1L": 0.1058188086442571 + "k1": 1.0821636087579767, + "k1L": 0.1623245413136965 }, "SINDI02.MQUA090": { - "k1": 1.0831188342002533, - "k1L": 0.162467825130038 + "k1": -0.2963160142228309, + "k1L": -0.04444740213342463 }, "S10CB01.MQUA230": { - "k1": -1.105837517460758, - "k1L": -0.1658756276191137 + "k1": -0.9430803588924669, + "k1L": -0.14146205383387003 }, "S10CB01.MQUA430": { - "k1": 1.9536618200799853, - "k1L": 0.2930492730119978 + "k1": 1.8700351214338993, + "k1L": 0.28050526821508487 }, "S10CB02.MQUA230": { - "k1": -1.5169102297795853, - "k1L": -0.22753653446693778 + "k1": -1.5169102297795856, + "k1L": -0.22753653446693783 }, "S10CB02.MQUA430": { - "k1": 1.5168434959109265, - "k1L": 0.22752652438663895 + "k1": 1.516843495910926, + "k1L": 0.2275265243866389 }, "S10DI01.MQUA030": { "k1": 0.0, "k1L": 0.0 }, "S10DI01.MQUA120": { - "k1": -1.5169102297795853, - "k1L": -0.22753653446693778 + "k1": -1.5169102297795856, + "k1L": -0.22753653446693783 }, "S10CB03.MQUA230": { - "k1": 1.5168434959109265, - "k1L": 0.22752652438663895 + "k1": 1.516843495910926, + "k1L": 0.2275265243866389 }, "S10CB03.MQUA430": { - "k1": -1.5169102297795853, - "k1L": -0.22753653446693778 + "k1": -1.5169102297795856, + "k1L": -0.22753653446693783 }, "S10CB04.MQUA230": { - "k1": 1.5168434959109265, - "k1L": 0.22752652438663895 + "k1": 1.516843495910926, + "k1L": 0.2275265243866389 }, "S10CB04.MQUA430": { - "k1": -1.5169102297795853, - "k1L": -0.22753653446693778 + "k1": -1.5169102297795856, + "k1L": -0.22753653446693783 }, "S10CB05.MQUA230": { - "k1": 1.5168434959109265, - "k1L": 0.22752652438663895 + "k1": 1.516843495910926, + "k1L": 0.2275265243866389 }, "S10CB05.MQUA430": { - "k1": -1.5169102297795853, - "k1L": -0.22753653446693778 + "k1": -1.5169102297795856, + "k1L": -0.22753653446693783 }, "S10CB06.MQUA230": { - "k1": 1.5168434959109265, - "k1L": 0.22752652438663895 + "k1": 1.516843495910926, + "k1L": 0.2275265243866389 }, "S10CB06.MQUA430": { - "k1": -1.5169102297795853, - "k1L": -0.22753653446693778 + "k1": -1.5169102297795856, + "k1L": -0.22753653446693783 }, "S10CB07.MQUA230": { - "k1": 1.5168434959109265, - "k1L": 0.22752652438663895 + "k1": 1.516843495910926, + "k1L": 0.2275265243866389 }, "S10CB07.MQUA430": { - "k1": -1.5129774896992223, - "k1L": -0.22694662345488334 + "k1": -1.5129774896991848, + "k1L": -0.2269466234548777 }, "S10CB08.MQUA230": { - "k1": 1.517944384602803, - "k1L": 0.22769165769042043 + "k1": 1.5179443846032685, + "k1L": 0.22769165769049027 }, "S10CB08.MQUA430": { - "k1": -1.5096528272269316, - "k1L": -0.22644792408403974 + "k1": -1.5096528272269247, + "k1L": -0.2264479240840387 }, "S10CB09.MQUA230": { - "k1": 1.5062716634435076, - "k1L": 0.22594074951652612 + "k1": 1.5062716634435955, + "k1L": 0.2259407495165393 }, "S10BC01.MQUA020": { - "k1": 1.862368197269046, - "k1L": 0.2793552295903569 + "k1": 2.085769566548272, + "k1L": 0.3128654349822408 }, "S10BC01.MQUA040": { - "k1": -1.5296045270305165, - "k1L": -0.22944067905457746 + "k1": -0.8069033654778649, + "k1L": -0.12103550482167973 }, "S10BC01.MQUA060": { - "k1": -0.38354123764473047, - "k1L": -0.057531185646709566 + "k1": -1.725445134057659, + "k1L": -0.25881677010864884 }, "S10BC01.MQUA080": { - "k1": -1.1904357252915274, - "k1L": -0.17856535879372912 + "k1": 0.7124612755726865, + "k1L": 0.10686919133590296 }, "S10BC01.MQUA100": { - "k1": 1.9157070423469043, - "k1L": 0.28735605635203565 + "k1": 1.0847185269653656, + "k1L": 0.16270777904480485 }, "S10BC02.MQSK110": { "k1": 0.0, @@ -265,24 +265,24 @@ "k1L": 0.0 }, "S10MA01.MQUA020": { - "k1": -1.015987317538298, - "k1L": -0.15239809763074472 + "k1": -0.952016344921428, + "k1L": -0.14280245173821418 }, "S10MA01.MQUA050": { - "k1": -0.23879096854324103, - "k1L": -0.03581864528148615 + "k1": -0.25860452290414104, + "k1L": -0.03879067843562115 }, "S10MA01.MQUA070": { - "k1": 0.5401102285342914, - "k1L": 0.0810165342801437 + "k1": 1.5927258007226863, + "k1L": 0.23890887010840295 }, "S10MA01.MQUA110": { - "k1": 1.1572928865274967, - "k1L": 0.1735939329791245 + "k1": -0.9147490503383028, + "k1L": -0.1372123575507454 }, "S10MA01.MQUA130": { - "k1": -0.5235508997621431, - "k1L": -0.07853263496432146 + "k1": 0.6789894261695975, + "k1L": 0.10184841392543961 }, "S20CB01.MQUA430": { "k1": -0.8635667730961264, @@ -297,20 +297,20 @@ "k1L": -0.12953501596441896 }, "S20SY01.MQUA020": { - "k1": 0.8309993998333361, - "k1L": 0.12464990997500042 + "k1": -1.4084554435040675, + "k1L": -0.21126831652561012 }, "S20SY01.MQUA030": { - "k1": -2.8422353911159757, - "k1L": -0.42633530866739633 + "k1": 1.6527516900200674, + "k1L": 0.2479127535030101 }, "S20SY01.MQUA050": { - "k1": 2.63570033432212, - "k1L": 0.395355050148318 + "k1": -1.2455405678473916, + "k1L": -0.18683108517710875 }, "S20SY01.MQUA080": { - "k1": -1.315697634864488, - "k1L": -0.1973546452296732 + "k1": 1.3915642831470632, + "k1L": 0.20873464247205947 }, "S20SY02.MQUA070": { "k1": -0.8522139943461451, @@ -329,24 +329,24 @@ "k1L": -0.18263923557583664 }, "S20SY03.MQUA020": { - "k1": 2.159937072060939, - "k1L": 0.32399056080914085 + "k1": 0.8592016943667193, + "k1L": 0.1288802541550079 }, "S20SY03.MQUA030": { - "k1": -1.888258670763935, - "k1L": -0.2832388006145902 + "k1": 0.6145489000262874, + "k1L": 0.0921823350039431 }, "S20SY03.MQUA050": { - "k1": -0.8582605230658291, - "k1L": -0.12873907845987437 + "k1": -0.08131657881685135, + "k1L": -0.012197486822527703 }, "S20SY03.MQUA060": { - "k1": 1.9803123306684582, - "k1L": 0.2970468496002687 + "k1": -1.268463537232424, + "k1L": -0.1902695305848636 }, "S20SY03.MQUA100": { - "k1": -1.6886645581691253, - "k1L": -0.25329968372536876 + "k1": 0.42585350235555686, + "k1L": 0.06387802535333352 }, "S30CB01.MQUA430": { "k1": 0.8200899250742555, @@ -369,20 +369,20 @@ "k1L": 0.12301348876113832 }, "S30CB06.MQUA430": { - "k1": -0.8191461508460806, - "k1L": -0.12287192262691207 + "k1": -0.8191461508460278, + "k1L": -0.12287192262690416 }, "S30CB07.MQUA430": { - "k1": 0.8194777493503865, - "k1L": 0.12292166240255797 + "k1": 0.819477749350287, + "k1L": 0.12292166240254306 }, "S30CB08.MQUA430": { - "k1": -0.818057922405338, - "k1L": -0.1227086883608007 + "k1": -0.8180579224051746, + "k1L": -0.12270868836077618 }, "S30CB09.MQUA430": { - "k1": 0.8181700346633946, - "k1L": 0.12272550519950917 + "k1": 0.8181700346634088, + "k1L": 0.12272550519951131 }, "S30CB10.MQUA430": { "k1": -0.8200880145207072, @@ -409,28 +409,28 @@ "k1L": 0.12301348876113832 }, "SARCL01.MQUA020": { - "k1": -0.47826973265434625, - "k1L": -0.07174045989815193 + "k1": -0.4721947573633969, + "k1L": -0.14165842720901906 }, "SARCL01.MQUA050": { - "k1": 0.17799422424630892, - "k1L": 0.05339826727389268 + "k1": 0.8586585366315584, + "k1L": 0.2575975609894675 }, "SARCL01.MQUA080": { - "k1": -0.5458365866360025, - "k1L": -0.16375097599080077 + "k1": -0.2762157259007257, + "k1L": -0.0828647177702177 }, "SARCL01.MQUA100": { - "k1": 0.37714104222112743, - "k1L": 0.11314231266633823 + "k1": -0.6942420234208115, + "k1L": -0.20827260702624345 }, "SARCL01.MQUA140": { - "k1": 1.3027630434569046, - "k1L": 0.3908289130370714 + "k1": 1.9079279284588924, + "k1L": 0.5723783785376677 }, "SARCL01.MQUA190": { - "k1": -1.5257544758797634, - "k1L": -0.457726342763929 + "k1": -1.3480651440295461, + "k1L": -0.4044195432088638 }, "SARCL02.MQUA130": { "k1": 2.470468387349568, @@ -477,32 +477,32 @@ "k1L": 0.7411405162048703 }, "SARMA01.MQUA010": { - "k1": -1.1706132612849132, - "k1L": -0.35118397838547394 + "k1": -1.1298461424430046, + "k1L": -0.33895384273290136 }, "SARMA01.MQUA060": { - "k1": 1.5075569628969636, - "k1L": 0.45226708886908906 + "k1": 1.4322857481803157, + "k1L": 0.4296857244540947 }, "SARMA01.MQUA080": { - "k1": -0.6940972890297992, - "k1L": -0.20822918670893975 + "k1": -0.6836560498111524, + "k1L": -0.2050968149433457 }, "SARMA01.MQUA120": { - "k1": -0.18956644741333395, - "k1L": -0.05686993422400018 + "k1": -0.1863031534579322, + "k1L": -0.05589094603737966 }, "SARMA01.MQUA140": { - "k1": 0.5634249743213624, - "k1L": 0.1690274922964087 + "k1": 0.36360900263012363, + "k1L": 0.10908270078903709 }, "SARMA02.MQUA050": { - "k1": -1.166689541844254, - "k1L": -0.09333516334754033 + "k1": -0.0, + "k1L": -0.0 }, "SARMA02.MQUA120": { - "k1": 2.3764545699601607, - "k1L": 0.19011636559681286 + "k1": 1.1882272849800803, + "k1L": 0.09505818279840643 }, "SARUN01.MQUA080": { "k1": -2.333379083688508, @@ -629,40 +629,40 @@ "k1L": 0.07911 }, "SATSY02.MQUA010": { - "k1": -1.8632364488249213, - "k1L": -0.2794854673237382 + "k1": -1.863246870188803, + "k1L": -0.2794870305283204 }, "SATSY02.MQUA110": { - "k1": 2.0999945209209123, - "k1L": 0.3149991781381368 + "k1": 2.09998, + "k1L": 0.31499699999999997 }, "SATSY02.MQUA120": { - "k1": -1.337654619748431, - "k1L": -0.20064819296226463 + "k1": -1.3376269839225505, + "k1L": -0.20064404758838258 }, "SATSY02.MQUA230": { - "k1": 1.2793583619784623, - "k1L": 0.19190375429676934 + "k1": 0.9794423515033617, + "k1L": 0.14691635272550424 }, "SATSY03.MQUA010": { - "k1": -0.39754052762249936, - "k1L": -0.0596310791433749 + "k1": -0.5694156597452804, + "k1L": -0.08541234896179206 }, "SATSY03.MQUA040": { - "k1": -1.4570226050980486, - "k1L": -0.21855339076470728 + "k1": -0.24586685750161577, + "k1L": -0.03688002862524237 }, "SATSY03.MQUA070": { - "k1": 1.4650924629495523, - "k1L": 0.21976386944243284 + "k1": 1.06006830306547, + "k1L": 0.1590102454598205 }, "SATSY03.MQUA100": { - "k1": 1.1136211041067194, - "k1L": 0.1670431656160079 + "k1": 1.0660997883422791, + "k1L": 0.15991496825134185 }, "SATSY03.MQUA130": { - "k1": -0.9451312675396689, - "k1L": -0.14176969013095034 + "k1": -0.632240294260727, + "k1L": -0.09483604413910905 }, "SATCL01.MQUA120": { "k1": -1.5422105147992289, @@ -677,44 +677,44 @@ "k1L": 0.2662987370313501 }, "SATCL01.MQUA180": { - "k1": 1.775326816207592, - "k1L": 0.2662990224311388 + "k1": 1.7753268229251369, + "k1L": 0.26629902343877054 }, "SATCL01.MQUA190": { - "k1": -1.5422139310752188, - "k1L": -0.2313320896612828 + "k1": -1.5422136922552871, + "k1L": -0.23133205383829306 }, "SATDI01.MQUA025": { - "k1": -0.006426080988893573, - "k1L": -0.0009639121483340358 + "k1": -0.006426559844529357, + "k1L": -0.0009639839766794035 }, "SATDI01.MQUA080": { - "k1": 0.5695458975368123, - "k1L": 0.08543188463052184 + "k1": 0.5695462762192454, + "k1L": 0.08543194143288681 }, "SATDI01.MQUA220": { - "k1": 1.0651729570976967, - "k1L": 0.1597759435646545 + "k1": 1.0651727343565924, + "k1L": 0.15977591015348885 }, "SATDI01.MQUA230": { - "k1": -1.0726811371865879, - "k1L": -0.16090217057798817 + "k1": -1.0726810528215058, + "k1L": -0.16090215792322587 }, "SATDI01.MQUA250": { - "k1": 0.5133752059645914, - "k1L": 0.07700628089468871 + "k1": 0.5133752059634685, + "k1L": 0.07700628089452027 }, "SATDI01.MQUA260": { - "k1": 0.020908544781024205, - "k1L": 0.0031362817171536306 + "k1": 0.020908544783342153, + "k1L": 0.003136281717501323 }, "SATDI01.MQUA280": { - "k1": -0.15397487582926772, - "k1L": -0.023096231374390156 + "k1": -0.15397487583082922, + "k1L": -0.023096231374624382 }, "SATDI01.MQUA300": { - "k1": -0.40769177837533965, - "k1L": -0.061153766756300944 + "k1": -0.40769177837501747, + "k1L": -0.061153766756252614 }, "SATCB01.MQUA230": { "k1": 0.45565642715018484, @@ -733,52 +733,52 @@ "k1L": -0.06834846407258482 }, "SATMA01.MQUA050": { - "k1": -0.09006214058367151, - "k1L": -0.007204971246693721 + "k1": 0.12494253895125812, + "k1L": 0.00999540311610065 }, "SATMA01.MQUA120": { - "k1": 0.922878446502609, - "k1L": 0.07383027572020871 + "k1": 0.36580812885808667, + "k1L": 0.029264650308646934 }, "SATMA01.MQUA140": { - "k1": 0.5492472413968162, - "k1L": 0.0439397793117453 + "k1": 1.2551688306881554, + "k1L": 0.10041350645505244 }, "SATMA01.MQUA160": { - "k1": -0.034637241237777804, - "k1L": -0.0027709792990222243 + "k1": -0.6506395391365137, + "k1L": -0.0520511631309211 }, "SATMA01.MQUA180": { - "k1": -2.7940650261163937, - "k1L": -0.2235252020893115 + "k1": -2.47504853282001, + "k1L": -0.1980038826256008 }, "SATMA01.MQUA230": { - "k1": 0.5561851669336954, - "k1L": 0.04449481335469563 + "k1": 0.4779018609371943, + "k1L": 0.038232148874975544 }, "SATMA01.MQUA250": { - "k1": 1.9625455728401648, - "k1L": 0.15700364582721318 + "k1": 2.0084531498602174, + "k1L": 0.16067625198881738 }, "SATMA01.MQUA610": { - "k1": -1.4163043129121315, - "k1L": -0.21244564693681972 + "k1": -1.4163043141063751, + "k1L": -0.21244564711595626 }, "SATMA01.MQUA630": { - "k1": 1.913891993184131, - "k1L": 0.28708379897761965 + "k1": 1.9138919932080345, + "k1L": 0.2870837989812052 }, "SATMA01.MQUA640": { - "k1": 0.8803820317217748, - "k1L": 0.13205730475826621 + "k1": 0.8803820321663556, + "k1L": 0.13205730482495334 }, "SATUN04.MQUA060": { - "k1": -2.2197650453967457, - "k1L": -0.17758120363173965 + "k1": -2.219765042959643, + "k1L": -0.17758120343677145 }, "SATUN05.MQUA420": { - "k1": -1.211228, - "k1L": -0.09689824 + "k1": -1.211228003134308, + "k1L": -0.09689824025074463 }, "SATUN06.MQUA080": { "k1": 3.8261274687710416, @@ -845,28 +845,28 @@ "k1L": -0.30466611103290253 }, "SATUN22.MQUA080": { - "k1": 2.0645639123663564, - "k1L": 0.16516511298930853 + "k1": 1.4409086581447608, + "k1L": 0.11527269265158087 }, "SATMA02.MQUA010": { - "k1": -4.028563685012154, - "k1L": -0.3222850948009723 + "k1": -3.446342081676855, + "k1L": -0.2757073665341484 }, "SATMA02.MQUA020": { - "k1": -1.399248597960218, - "k1L": -0.11193988783681745 + "k1": -0.9038263098875778, + "k1L": -0.07230610479100623 }, "SATMA02.MQUA040": { - "k1": 1.5219465565299637, - "k1L": 0.1217557245223971 + "k1": 1.5171487105828372, + "k1L": 0.12137189684662698 }, "SATMA02.MQUA050": { - "k1": 2.536264048736571, - "k1L": 0.20290112389892567 + "k1": 2.3325743139954573, + "k1L": 0.1866059451196366 }, "SATMA02.MQUA070": { - "k1": -2.8002834083164663, - "k1L": -0.2240226726653173 + "k1": -2.6864330672728878, + "k1L": -0.21491464538183103 }, "SATBD01.MQUA010": { "k1": 0.5069789237265826, @@ -893,7 +893,7 @@ "k1L": 0.0 }, "SARBD02.MQUA030": { - "k1": 0, + "k1": 0.0, "k1L": 0.0 }, "SATBD02.MQUA030": { @@ -1493,7 +1493,7 @@ }, "Undulator": { "SINLH02.UIND230": { - "K": 2.34, + "K": 2.27, "kx": 0, "ky": 1 }, @@ -1759,5 +1759,11 @@ "location": "SINLH02.MBND100", "energy": 140.0 }, - "InitialCondition": null + "InitialCondition": { + "betx": 29.971, + "alfx": 0.003, + "bety": 26.0, + "alfy": -0.288 + }, + "Phase": 0 } \ No newline at end of file diff --git a/Scripts/Final/SFPlus/initTwiss.madx b/Scripts/Final/SFPlus/initTwiss.madx index c53b7c5..d9391a5 100644 --- a/Scripts/Final/SFPlus/initTwiss.madx +++ b/Scripts/Final/SFPlus/initTwiss.madx @@ -6,7 +6,6 @@ TwissM2: beta0, betx = 11.1557, alfx = -1.17, bety = 50, alfy = 0.; ! label: Af 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=15,alfx=5,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 diff --git a/issues.txt b/issues.txt index 848ef85..a9a3c33 100644 --- a/issues.txt +++ b/issues.txt @@ -3,4 +3,6 @@ 1) Athos branch os not fully saved in settings +2) sextupole matching for Reference file +3) SOlve match problems with leaked dispersion