HeiligeListe/SwissFEL-HL
1
1
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Updated Matching for new Lattice
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 6s
Details

Browse Source
This commit is contained in:
reiche
2025-11-21 16:21:25 +01:00
parent 5b9e21896d
commit c8d6ed3c5f
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Matching/matchAthos.madx
View File

@@ -85,8 +85,8 @@ LMDIF,CALLS=1000,TOLERANCE=1.e-21;
ENDMATCH;
L = 38-9.8;
alpha=0.9;
alpha=1;
alpha=1.05;
beta = L*alpha;
MATCH,SEQUENCE=SwissFEL,range=s20sy02$start/satsy03$end,beta0=twisssep;
VARY,NAME=satsy02.mqua205.k1,STEP=0.0001;
@@ -179,6 +179,20 @@ plot,haxis=s,vaxis=dx,dy,range=#s/#e,colour=100;
plot,haxis=s,vaxis=re56,range=#s/#e,colour=100;
scl:=1.5;
ss:=0.83;
@@ -186,34 +200,29 @@ satdi01.mqua080.k1:=0.8*scl;
satdi01.mqua220.k1:=-0.52*scl;
satdi01.mqua230.k1:=-1.2*ss;
satdi01.mqua250.k1:=1.2*ss;
satdi01.mqua260.k1:=1.2*ss;
satdi01.mqua280.k1:=-1.2*ss+0.2;
satcb01.mqua230.k1:=1.2*ss;
satcb01.mqua430.k1:=-1.2*ss+0.2;
satdi01.mqua300.k1=0;
satcb01.mqua230.k1=0;
satcb01.mqua430.k1=0;
satcb02.mqua230.k1=0;
satcb02.mqua430.k1=0;
L = 26.;
L = 20.;
alpha=0.7;
beta=L*alpha;
MATCH, SEQUENCE=SwissFEL,range=s20sy02$start/satdi01$end,beta0=twisssep;
MATCH, SEQUENCE=SwissFEL,range=s20sy02$start/satcb01$end,beta0=twisssep;
VARY,NAME=satdi01.mqua080.k1,STEP=0.0001,lower=-1.8,upper=1.8;
VARY,NAME=satdi01.mqua220.k1,STEP=0.0001,lower=-1.8,upper=1.8;
VARY,NAME=satdi01.mqua230.k1,STEP=0.0001,lower=-1.8,upper=1.8;
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;
VARY,NAME=satdi01.mqua280.k1,STEP=0.0001,lower=-1.8,upper=1.8;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua280$end,betx=beta;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua280$end,alfx=alpha;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua280$end,bety=beta;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua280$end,alfy=alpha;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua300$start,x<10;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua300$start,y<10;
CONSTRAINT,SEQUENCE=swissfel,range=satdi01.mqua300$start,DX<10;
VARY,NAME=satcb01.mqua230.k1,STEP=0.0001,lower=-1.8,upper=1.8;
VARY,NAME=satcb01.mqua430.k1,STEP=0.0001,lower=-1.8,upper=1.8;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$end,betx=beta;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$end,alfx=alpha;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$end,bety=beta;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$end,alfy=alpha;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$start,x<10;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$start,y<10;
CONSTRAINT,SEQUENCE=swissfel,range=satcb01.mqua430$start,DX<10;
LMDIF,CALLS=1000,TOLERANCE=1.e-21;
ENDMATCH;
@@ -243,9 +252,9 @@ satun10.mqua080.k1 := satun06.mqua080.k1;
satun11.mqua080.k1 := satun07.mqua080.k1;
satun12.mqua080.k1 := satun06.mqua080.k1;
satun13.mqua080.k1 := satun07.mqua080.k1;
satun14.mqua420.k1 := satun06.mqua080.k1;
satun14.mqua080.k1 := satun06.mqua080.k1;
satun15.mqua080.k1 := satun07.mqua080.k1;
satun16.mqua080.k1 := satun06.mqua080.k1;
satun16.mqua420.k1 := satun06.mqua080.k1;
satun17.mqua080.k1 := satun07.mqua080.k1;
satun18.mqua080.k1 := satun06.mqua080.k1;
satun19.mqua080.k1 := satun07.mqua080.k1;
@@ -253,6 +262,9 @@ satun20.mqua080.k1 := satun06.mqua080.k1;
satun21.mqua080.k1 := satun07.mqua080.k1;
satun22.mqua080.k1 := satun06.mqua080.k1;
satun23.mqua080.k1 := satun07.mqua080.k1;
satun24.mqua080.k1 := satun06.mqua080.k1;
satun25.mqua080.k1 := satun07.mqua080.k1;
satun26.mqua080.k1 := satun06.mqua080.k1;
twiss,sequence=swissfel,range=satun06$start/satun07$end;
@@ -299,14 +311,14 @@ plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100;
scl=4.0;
satcb01.mqua230.k1=scl*0.2*0;
satcb01.mqua430.k1=-scl*0.2*0;
scl=4;
satcb02.mqua230.k1=scl*0.2;
satcb02.mqua430.k1=-scl*0.2;
satcb03.mqua230.k1=scl*0.2;
satcb03.mqua430.k1=-scl*0.2;
satma01.mqua050.k1=0;
satma01.mqua120.k1=0;
satma01.mqua140.k1=0;
satma01.mqua160.k1=0;
@@ -316,7 +328,7 @@ satma01.mqua250.k1=0;
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=satcb03.mqua430.k1,STEP=0.0001,lower=-3.8,upper=3.8;
VARY,NAME=satma01.mqua120.k1,STEP=0.0001,lower=-3.8,upper=3.8;
VARY,NAME=satma01.mqua140.k1,STEP=0.0001,lower=-3.8,upper=3.8;
VARY,NAME=satma01.mqua160.k1,STEP=0.0001,lower=-3.8,upper=3.8;
@@ -342,6 +354,6 @@ twiss,SEQUENCE=swissfel,range=s20sy02$start/satun11$end,beta0=twisssep;
plot,haxis=s,vaxis=betx,bety,range=satdi01$start/#e,colour=100;
twiss,SEQUENCE=swissfel,range=#s/satun22$end,beta0=twiss0;
twiss,SEQUENCE=swissfel,range=#s/satun26$end,beta0=twiss0;
plot,haxis=s,vaxis=betx,bety,range=#s/#e,colour=100;
plot,haxis=s,vaxis=dx,dy,range=#s/#e,colour=100;

2
Matching/matchInjector.madx
View File

@@ -119,7 +119,7 @@ plot,haxis=s,vaxis=betx,bety,range=sinbc02$start/#e,colour=100;
s10cb01.mqua230.k1=0.2;
s10cb01.mqua430.k1=-0.2;
muLin1=0.20;
muLin1=0.2;
match,SEQUENCE=swissfel,range=S10cb01$start/s10cb01$end;
Vary,name=S10CB01.MQUA230.k1,step=0.0001;