Changeset 12 in MML

Timestamp:

Jan 10, 2014, 2:46:09 PM (10 years ago)

Author:

zhangj

Message:

Fix the bug of the ring circumference in the ring lattices to get the correct 6D-orbit.

Location:

trunk

Files:

• at/atphysics (modified) (2 props)
• machine/SOLEIL/common/plotfamily/plotfamilystartup.m (modified) (1 diff)
• machine/THOMX/StorageRing/Lattices/CDR_017_064_r56_02_sx_Dff_corrSX_BPMIP.m (modified) (1 diff)
• machine/THOMX/StorageRing/Lattices/CDR_017_072_r56_02_sx_Dff_corrSX_BPMIP.m (modified) (2 diffs)
• machine/THOMX/StorageRing/bpm/getidbpmlist.m (added)
• machine/THOMX/StorageRing/thomxinit.m (modified) (3 diffs)
• machine/THOMX/TL/Lattices/TLlattice.m (modified) (1 diff)
• machine/THOMX/TL/TLinit.m (modified) (3 diffs)
• machine/THOMX/TL/setoperationalmode.m (modified) (1 diff)
• machine/THOMX/TL/updateatindex.m (modified) (1 diff)
• machine/THOMX/common/plotfamily/plotfamily.fig (modified) (previous)
• machine/THOMX/common/plotfamily/plotfamily.m (modified) (3 diffs)
• machine/THOMX/common/plotfamily/plotfamilystartup.m (modified) (1 diff)
• machine/THOMX/readme (modified) (1 diff)

trunk/at/atphysics

@@ +1 @@
+findmpoleraddiffmatrix.mexa64
  *.mexa64
 

@@ +1 @@
+findmpoleraddiffmatrix.mexa64
  *.mexa64
 

trunk/machine/SOLEIL/common/plotfamily/plotfamilystartup.m

@@ -17 +17 @@
                 'SDL13 (NANO)', 'SDM14 (SEXTANTS)', 'SDC14 (SIXS)', 'SDM15 (CASSIOPEE)', 'SDC15 (SIRIUS)', 'SDM16 (LUCIA)', ...
                 };
-Superperiods = 4; % number of superperiods
+Superperiods = 2; % number of superperiods
 
 L = getfamilydata('Circumference');

trunk/machine/THOMX/StorageRing/Lattices/CDR_017_064_r56_02_sx_Dff_corrSX_BPMIP.m

@@ -18 +18 @@
 disp(['** Loading THOMX ring lattice ',mfilename]);
 
-L0 = 16.8; 
+L0 =  16.789703999999997;   % the 6D ThomX ring is very sensitive to the 
+             %   longitudinal setting, so defind the 
+             %   value of L0 as the value getting from "getcircumfenrence"!!!
 C0 = 2.99792458e8; % speed of light [m/s]
 % HarmNumber = 28.0899; % RF harmonic number

trunk/machine/THOMX/StorageRing/Lattices/CDR_017_072_r56_02_sx_Dff_corrSX_BPMIP.m

@@ -27 +27 @@
  
  
- L0 = 16.789680000000004; % design circumference length [m]; 
+ L0 = 16.789703999999997; % design circumference length [m]; 
                           % ThomX machine is very sensitive
-                          %  to the accuracy of the circumference 
+                          %  to the accuracy of the circumference !!!!!!!!
  C0 = 2.99792458e8; % speed of light [m/s]
 % HarmNumber = 28.0899; % RF harmonic number
@@ -124 +124 @@
 % the same location as sextupole
 %========================
-%
+% length kick angle x/y
  HCOR = corrector('HCOR',1.0e-6,[0.0, 0],'CorrectorPass');
  

trunk/machine/THOMX/StorageRing/thomxinit.m

@@ -203 +203 @@
 AO.(ifam).History.MemberOf = {'Plotfamily'};
 
+% 4 electrodes?
 AO.(ifam).Va = AO.(ifam).History;
 AO.(ifam).Va.TangoNames(:,:)       = strcat(dev, '/VaSA');
@@ -432 +433 @@
 end
 
-
+% need to customized for ThomX?
 AO.(ifam).Setpoint.Tolerance(:,:)    = 1e-2*ones(devnumber,1);
-
-% need to customized for ThomX?
 % Warning optics dependent cf. Low alpha lattice
 AO.(ifam).Setpoint.DeltaRespMat(:,:) = ones(devnumber,1)*5e-6*2; % 2*5 urad (half used for kicking)
@@ -586 +585 @@
 %convert response matrix kicks to HWUnits (after AO is loaded to AppData)
 setao(AO);   %required to make physics2hw function
+
 AO.(ifam).Setpoint.DeltaRespMat = physics2hw(AO.(ifam).FamilyName,'Setpoint', ...
     AO.(ifam).Setpoint.DeltaRespMat, AO.(ifam).DeviceList);

trunk/machine/THOMX/TL/Lattices/TLlattice.m

@@ -97 +97 @@
 
 % Lattice
+% definition of BPMX must be followed by BPMz
 ELIST =[DEBUT ...
  SD1L   HCOR    VCOR    SD1L     QP1L     SD2L    QP2L     SD2L   QP3L ...

trunk/machine/THOMX/TL/TLinit.m

@@ -361 +361 @@
 
 
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Horizontal Correctors
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 ifam = 'HCOR';
 AO.(ifam).FamilyName           = ifam;
+AO.(ifam).FamilyType           = 'COR';
 AO.(ifam).MemberOf             = {'MachineConfig'; 'Magnet'; 'COR'; 'HCOR'; 'Archivable'};
 
@@ -398 +400 @@
 
 AO.(ifam).Setpoint = AO.(ifam).Monitor;
-%AO.(ifam).Monitor.TangoNames     = strcat(AO.(ifam).DeviceName, '/currentPM');
-
+%AO.(ifam).Monitor.TangoNames     = strcat(AO.(ifam).DeviceName,
+%'/currentPM');
+
+%need to modify when ThomX is ready
+AO.(ifam).Setpoint.Tolerance(:,:)    = 1e-2*ones(devnumber,1);
+AO.(ifam).Setpoint.DeltaRespMat(:,:) = ones(devnumber,1)*5e-6*2; % 2*5 urad (half used for kicking)
+
+setao(AO);
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Vertical Correctors
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 ifam = 'VCOR';
 
 AO.(ifam).FamilyName           = ifam;
+AO.(ifam).FamilyType           = 'COR';
 AO.(ifam).MemberOf             = {'MachineConfig'; 'Magnet'; 'COR'; 'VCOR'; 'Archivable'};
 AO.(ifam).Mode                 = Mode;
@@ -439 +451 @@
 AO.(ifam).Setpoint = AO.(ifam).Monitor;
 %AO.(ifam).Monitor.TangoNames     = strcat(AO.(ifam).DeviceName, '/currentPM');
+
+%need to modify when ThomX is ready
+AO.(ifam).Setpoint.Tolerance(:,:)    = 1e-2*ones(devnumber,1);
+AO.(ifam).Setpoint.DeltaRespMat(:,:) = ones(devnumber,1)*5e-6*2; % 2*5 urad (half used for kicking)
+
 setao(AO);
 

trunk/machine/THOMX/TL/setoperationalmode.m

@@ -55 +55 @@
 
 
-
+%need to update for ThomX...
 % Tune processor delay: delay required to wait
 % to have a fresh tune measurement after changing

trunk/machine/THOMX/TL/updateatindex.m

@@ -97 +97 @@
     TwissData.beta  = [34.46,33.94]';
     TwissData.mu    = [0 0]';
-    TwissData.ClosedOrbit = [0 0 0 0]';
-    TwissData.dP = 0;
-    TwissData.dL = 0;
+    TwissData.ClosedOrbit = [0 0 0 0]'; %initial 4-D COD
+    TwissData.dP = 0;             %initial dP
+    TwissData.dL = 0;             % initial dL
     TwissData.Dispersion  = [0 0 0 0]';
 

trunk/machine/THOMX/common/plotfamily/plotfamily.m

@@ -29 +29 @@
 
 
-% Last Modified by GUIDE v2.5 29-Jul-2011 11:51:08
+% Last Modified by GUIDE v2.5 10-Jan-2014 10:30:58
 
 
@@ -161 +161 @@
 elseif strcmpi(Machine,'Booster')
     namestr = 'Booster';
-elseif strcmpi(Machine,'LT1') || strcmpi(Machine,'LT2')
-    error('Not working for LT1 or LT2');
+elseif strcmpi(Machine,'TL') || strcmpi(Machine,'EL')
+    error('Not working for TL or EL');
 else
     error('Unknown machine\n exiting ...');
@@ -4250 +4250 @@
 % eventdata  reserved - to be defined in a future version of MATLAB
 % handles    structure with handles and user data (see GUIDATA)
+
+
+% --- Executes on mouse press over axes background.
+function Graph1_ButtonDownFcn(hObject, eventdata, handles)
+% hObject    handle to Graph1 (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)

trunk/machine/THOMX/common/plotfamily/plotfamilystartup.m

@@ -11 +11 @@
 set(handles.DisabledSetpointChanges, 'Checked', 'On');
 
-Sectors = 16; % number of sectors
-Straights = 24; % numberof straight sections
+Sectors = 2; % number of sectors
+Straights = 4; % numberof straight sections
 StraigthPosition = [0; getspos('BPMx', getidbpmlist)]; 
 % is it the best place for these definitions ?

trunk/machine/THOMX/readme

@@ -14 +14 @@
 
 case 'TANGO'
+
+
+(3) 10/01/2014   By Jianfeng Zhang @ LAL
+    The 6D orbit of the ThomX ring is very sensitive to the correct
+    setting of the RF cacity. So the ring cirumfenrence should be
+    set to the value get by "getcircumference.m", the speed of the 
+    light should be the same as the one defined in "findorbit6.m",
+    the harmonic number should be corrected set, then one can get 
+     the right value of the synchrotron
+    phase!!!!!!!!!!!
+
+    Otherwise, the 6D orbit is not correct!!!!!!!!!!!!
+
+    This constrait requires the accurate measurements of the ring 
+    circumference and other longitudinal parameters (RF cavity voltage,
+    phase, harmonic number) etc!!!!!!! Otherwise, one can't correctly
+    model the ThomX ring!!!!!!!!!!!!!! 

@@ +1 @@
+findmpoleraddiffmatrix.mexa64
  *.mexa64