From 360c1e9c014f078e4bec34083aaf7c79c597eb44 Mon Sep 17 00:00:00 2001 From: Sven Date: Mon, 26 Jan 2026 17:39:58 +0100 Subject: [PATCH] Improving reference optics for current phase --- .../Reference-SwissFEL/matchAthos.madx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Scripts/Current/Reference-SwissFEL/matchAthos.madx b/Scripts/Current/Reference-SwissFEL/matchAthos.madx index 7ce14d4..fc718d7 100644 --- a/Scripts/Current/Reference-SwissFEL/matchAthos.madx +++ b/Scripts/Current/Reference-SwissFEL/matchAthos.madx @@ -80,7 +80,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 = 0; +CONSTRAINT, SEQUENCE=swissfel, RANGE=satsy01$end, DX = leakdisp; ! good value is about -0.03 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; @@ -89,7 +89,7 @@ ENDMATCH; -satsy01.mqua280.k1 = satsy01.mqua280.k1*(1+leakdisp); +!satsy01.mqua280.k1 = satsy01.mqua280.k1*(1+leakdisp); !------------------------------------------ ! close vertical dispersion @@ -111,8 +111,8 @@ LMDIF, CALLS=1000, TOLERANCE=1.E-21; ENDMATCH; -satcl011:=-1.3; -satcl012:= 1.1; +satcl011:=-1.1; +satcl012:= 1.3; satcl01.mqua120.k1:=satcl011; satcl01.mqua130.k1:=satcl012; satcl01.mqua180.k1:=satcl012; @@ -137,9 +137,9 @@ 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=20; +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,betx<10; CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,alfx=-0.01; -CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,bety=10; ! was 13.8 +CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,bety<2; ! was 13.8 CONSTRAINT, SEQUENCE=swissFEL, RANGE=satcl01.msex160,alfy=-0.01; constraint, sequence=swissfel, range=satsy03.mqua130$end, betx <90 ; constraint, sequence=swissfel, range=satsy03.mqua130$end, bety <90 ; @@ -149,10 +149,14 @@ 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; +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.mqua180.k1, STEP=0.00001,LOWER=Kmin,UPPER=Kmax; +!VARY, NAME= satcl01.mqua190.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, X < 1; +!CONSTRAINT, SEQUENCE=swissfel, RANGE=satcl01$end, Y < 1; LMDIF, CALLS=1000, TOLERANCE=1.E-21; ENDMATCH;