fix tolerance for qh matching

toolkit/rematch_makethin.madx

@@ -15,8 +15,8 @@ SEQEDIT, SEQUENCE=FCCEE_P_RING;
 	INSTALL, ELEMENT=GMARK2.1, CLASS=MARKER, AT=LQG9/2, FROM=QG9.1;
 	
 	INSTALL, ELEMENT=HMARK.1, CLASS=MARKER, AT=-LQU8/2, FROM=QU8.1; 
-	INSTALL, ELEMENT=UMARK1.1, CLASS=MARKER, AT=35, FROM=QU7.1; 
-	INSTALL, ELEMENT=UMARK2.1, CLASS=MARKER, AT=80, FROM=QU1.1; 
+	INSTALL, ELEMENT=UMARK1.1, CLASS=MARKER, AT=LQU7/2, FROM=QU7.1; 
+	INSTALL, ELEMENT=UMARK2.1, CLASS=MARKER, AT=LQU1/2, FROM=QU1.1; 
 	INSTALL, ELEMENT=RFMARK1.1, CLASS=MARKER, AT=17, FROM=QRDR2.1; 
 	INSTALL, ELEMENT=RFMARK2.1, CLASS=MARKER, AT=17, FROM=QRDR4.1; 
 
@@ -78,6 +78,9 @@ TWISS;
 SELECT, FLAG=makethin, SLICE=8;
 SELECT, FLAG=makethin, CLASS=RFCAVITY, SLICE = 1;
         
+SELECT, FLAG=makethin, PATTERN="^QH.*", SLICE=20;
+SELECT, FLAG=makethin, PATTERN="^QR.*", SLICE=20;
+SELECT, FLAG=makethin, PATTERN="^QU.*", SLICE=20;
 SELECT, FLAG=makethin, PATTERN="^QC.*", SLICE=20;
 SELECT, FLAG=makethin, PATTERN="^SY.*", SLICE=20;
 
@@ -312,9 +315,10 @@ MATCH, SEQUENCE= FCCEE_P_RING, BETA0= B.IP, RANGE=#S/HMARK.1;
 	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, BETY = B.HMARK->BETY;
 	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, ALFX = B.HMARK->ALFX;
 	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, ALFY = B.HMARK->ALFY;
+	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, MUX = B.HMARK->MUX;
 	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, MUY = B.HMARK->MUY;
-	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, DPX = B.HMARK->DPX;	
 	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, DX = B.HMARK->DX;
+	CONSTRAINT, SEQUENCE= FCCEE_P_RING, RANGE = HMARK.1, DPX = B.HMARK->DPX;	
 	
 	VARY,NAME = K1QH2;
 	VARY,NAME = K1QH3;
@@ -324,11 +328,11 @@ MATCH, SEQUENCE= FCCEE_P_RING, BETA0= B.IP, RANGE=#S/HMARK.1;
 	VARY,NAME = K1QH7;
 	VARY,NAME = K1QH8;
 
-LMDIF, CALLS = 5000 , TOLERANCE = 1E-11;
-JACOBIAN, CALLS = 5000 , TOLERANCE = 1E-11, STRATEGY = 3;
+LMDIF, CALLS = 500 , TOLERANCE = 1E-11;
+JACOBIAN, CALLS = 1000 , TOLERANCE = 1E-11, STRATEGY = 3;
 ENDMATCH;
 
-IF (TAR > 1E-10) { EXEC, QUIT; }
+IF (TAR > 1E-8) { EXEC, QUIT; }
 
 //Further RF matching
 
@@ -347,17 +351,17 @@ MATCH, SEQUENCE= FCCEE_P_RING, BETA0= B.IP, RANGE=#S/UMARK2.1;
 	VARY,NAME = K1QU2;
 	VARY,NAME = K1QU3;
 	VARY,NAME = K1QU4;
-	VARY,NAME = K1QU5;
-	VARY,NAME = K1QU6;
+	! VARY,NAME = K1QU5;
+	! VARY,NAME = K1QU6;
 	VARY,NAME = K1QU7;
 	VARY,NAME = K1QU8;
 
-LMDIF, CALLS = 5000 , TOLERANCE = 1E-11;
-JACOBIAN, CALLS = 5000 , TOLERANCE = 1E-11, STRATEGY = 3;
+LMDIF, CALLS = 500 , TOLERANCE = 1E-11;
+JACOBIAN, CALLS = 1000 , TOLERANCE = 1E-11, STRATEGY = 3;
 ENDMATCH;
 
 
-IF (TAR > 1E-10) { EXEC, QUIT; }
+IF (TAR > 1E-8) { EXEC, QUIT; }
 
 //Many independant RF cells... match to what it was before
 
@@ -525,7 +529,6 @@ IF (TAR > 1E-10) { EXEC, QUIT; }
 
 }
 
-TWISS, BETA0=B.IP, FILE='twiss_match_test.tfs';
 
 //Match to arc