Changeset 5 in MML for trunk/at/atphysics/fitchrom2.m

Timestamp:

Dec 18, 2013, 12:39:15 PM (10 years ago)

Author:

zhangj

Message:

ThomX MML version on the LAL server @ 17/12/2013

Location:

trunk

Files:

• . (modified) (1 prop)
• at/atphysics/fitchrom2.m (modified) (4 diffs)

trunk/at/atphysics/fitchrom2.m

@@ -1 @@
-function varargout =  fitchrom2(newchrom, sextfam1, sextfam2, varargin)
+function [FinalS1,FinalS2] =  fitchrom2(newchrom, sextfam1, sextfam2, varargin)
+%function varargout =  fitchrom2(newchrom, sextfam1, sextfam2, varargin)
 %FITCHROM2 fits chromaticity  of THERING using 2 sextupole families
 %  FITCHROM2(NEWCHROM,SEXTUPOLEFAMILY1,SEXTUPOLEFAMILY2)
@@ -23 +24 @@
 %  MARCH 25, 2005 - Take into account thin sextupoles
 %                 - Display Flag
+%
+%
+%   Modified by Jianfeng Zhang 30/09/2013 @ LAL
+%   Display the sextupole strengths after correction.
+%
+
 
 DisplayFlag = 1;
@@ -107 +114 @@
 end
 
+%% Get the final value of the correction sextupole
+
+   FinalS1 = getcellstruct(THERING,'PolynomB',S1I,3);
+   FinalS2 = getcellstruct(THERING,'PolynomB',S2I,3);
+ 
 %% Display how good is the fit
 if DisplayFlag
@@ -112 +124 @@
     [tune xi] = tunechrom(THERING,0,'chrom');
     fprintf('Reached chromaticities xix=%f xiz=%f\n',xi);
+    
+    fprintf('before correction: %s = %f, %s = %f\n', sextfam1,InitialS1(1),sextfam2,InitialS2(1));
+    fprintf('after correction:  %s = %f, %s = %f\n', sextfam1,FinalS1(1),sextfam2,FinalS2(1));
 end