Changeset 27 in MML for trunk/machine/THOMX/common

Timestamp:

Feb 25, 2014, 10:52:57 AM (10 years ago)

Author:

zhangj

Message:

(1) Fix the bug to define all sextupole members in one family in AO. (2) Fix the bug to get and define the conversions between the dipole current and beam energy, for the two types dipoles in the transfer line.

Location:

trunk/machine/THOMX/common

Files:

• bend2gev.m (modified) (5 diffs)
• gev2bend.m (modified) (3 diffs)

trunk/machine/THOMX/common/bend2gev.m

@@ -1 +1 @@
 function [GeV B] = bend2gev(varargin)
 %
-%
-% Need to be updated...
-% Custmized for ThomX machine by Jianfeng Zhang @ LAL, 21/06/2013
 %
 %
@@ -9 +6 @@
 % BEND2GEV - Compute the energy based on the ramp tables
 % GeV = bend2gev(Family, Field, Amps, DeviceList, BranchFlag)
+%
+% The dipole currents are connected to the beam energy (TL & Ring & EL)
+%  Change the beam energy then the dipole currents need to be adjusted!!!!
+%
 %
 %  INPUTS
@@ -27 +28 @@
 %
 %  See Also bend2gev
-
+%
+%
+%
+%
 
 %
@@ -35 +39 @@
 % TODO Need BLeff = function of the dipole current
 
-% Default
+%
+%
+% Need to be updated...
+% Custmized for ThomX machine by Jianfeng Zhang @ LAL, 21/06/2013
+%
+%
+%  25/02/2014  by Jianfeng Zhang @ LAL
+%     Fix the bug to discriminate the two types dipoles in the TL, then to 
+%     get the correct beam energy.
+%
+
+%% Default
 Family = '';
 Field = '';
@@ -217 +232 @@
             % k(i,1) = polyval(C, Amps(i)) / brho;
 
-            theta = 0.785398163397448; % rad <--> 45 degrees
+            % There are two types of dipole in ThomX TL.
+            if(strcmp(Family,'BEND1'))
+                theta = 0.785398163397448; % rad <--> 45 degrees
+            elseif(strcmp(Family,'BEND2'))
+                theta = 0.1690000; %rad <--> 9.68 degrees
+            else
+                error('Error! The dipole family in the ThomX TL is either "BEND1" or "BEND2" ');
+            end
+            
             
             % need to customized for ThomX
-            BLeff = 1.7780;
+            BLeff = 0.1684;  % 50 MeV of ThomX machine
             
             

trunk/machine/THOMX/common/gev2bend.m

@@ -1 +1 @@
 function Amps = gev2bend(varargin)
-%GEV2BEND - Converts beam energy TO BEND current
+%GEV2BEND - Converts beam energy TO BEND (ring) or BEND1 (TL), or BEND2 currents
 %
 % beam energy/dipole bending angle (BL/Brho) ---> dipole current
@@ -40 +40 @@
 % Modified by Jianfeng Zhang @ LAL, 18/09/2013 
 % Need to be modified when the magnet is ready...
+%
+%
+% 24/02/2014 Jianfeng Zhang @ LAL
+%      Fix the bugs to turn on/off the dipole current in TL, since
+%      there are two types of dipoles in TL: BEND1, BEND2.
+%
+%
+%
+
 
 %  Default
@@ -188 +197 @@
             r1inear = (A(end)-BL) / A(end-1);
             
-        case { 'TL'}
+     case { 'TL'}
     
-            brho = getbrho(GeV1);
-            theta = 0.785398163397448; %rad <--> 45 degrees
-            BL = brho*theta;
-            p  = A;
-            p(end)  = A(end) - BL;
-            r1inear = (A(end)-BL) / A(end-1);
-           
+      % BEND1 & BEND2 have different field strength
+      % main dipoles
+      if(strcmp(Family,'BEND1'))
+        
+        brho = getbrho(GeV1);
+        theta = 0.785398163397448; %rad <--> 45 degrees
+        BL = brho*theta;
+        p  = A;
+        p(end)  = A(end) - BL;
+        r1inear = (A(end)-BL) / A(end-1);
+            
+        % injection dipole
+      elseif(strcmp(Family,'BEND2'))
+        brho = getbrho(GeV1);
+        theta = 0.1690000; %rad <--> 9.68 degrees
+        BL = brho*theta;
+        p  = A;
+        p(end)  = A(end) - BL;
+        r1inear = (A(end)-BL) / A(end-1);
+      else
+        error('Error! The dipole in the transfer line is either "BEND1" or "BEND2"');
+            end
+            
             
         case 'EL'