Changeset 8 in MML

Timestamp:

Dec 18, 2013, 3:39:52 PM (10 years ago)

Author:

zhangj

Message:

Fix the bug to get correct machine type of the TL.

Location:

trunk

Files:

• LOGFILE_thomx.m (modified) (1 diff)
• at/atphysics (modified) (1 prop)
• at/simulator/element (modified) (1 prop)
• at/simulator/element/user (modified) (1 prop)
• at/simulator/track (modified) (1 prop)
• machine/THOMX/StorageRing/Lattices/CDR_017_064_r56_02_sx_Dff_corrSX_BPMIP.m (added)
• machine/THOMX/StorageRing/Lattices/CDR_017_072_r56_02_sx_Dff_corrSX_BPMIP.m (modified) (6 diffs)
• machine/THOMX/StorageRing/setoperationalmode.m (modified) (1 diff)
• machine/THOMX/StorageRing/thomxringgui.fig (modified) (previous)
• machine/THOMX/TL/TLinit.m (modified) (1 diff)
• machine/THOMX/TL/aoinit.m (modified) (1 diff)
• machine/THOMX/TL/setoperationalmode.m (modified) (1 diff)
• machine/THOMX/readme (added)
• mml/plotcm.m (modified) (1 diff)
• mml/setpaththomx.m (modified) (2 diffs)

trunk/LOGFILE_thomx.m

@@ -159 +159 @@
 
 
+   
+ 

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

@@ -36 +36 @@
  %% ======================
 %  RF Cavity
-% =======================
+% ========================
 %              NAME   L     U[V]       f[Hz]          h        method
 RF = rfcavity('RF', 0.0,  300e3, HarmNumber*C0/L0, HarmNumber, ...
@@ -113 +113 @@
 %% =======================
 % BPM
+% installed before or after quadrupole
 %========================
 % horizontal
@@ -121 +122 @@
 %% =======================
 % correctors
+% the same location as sextupole
 %========================
 %
@@ -132 +134 @@
  
  DEBUT = drift('DEBUT',0.0,'DriftPass');
-FIN = drift('FIN',0.0,'DriftPass');
+ FIN   = drift('FIN',0.0,'DriftPass');
 
 
@@ -146 +148 @@
   SD1S1         SX2           HCOR          VCOR          SD1S          QP4 ...         
   SD2           QP3           SD2S          BPMx          BPMz          SD2S...         
-  COE           BEND           COS           SD0           BPMx ...
-  BPMz          SD0           COE           ...
+  COE           BEND           COS           SD0            ...
+  SD0           COE           ...
   BEND           COS           SD2S          BPMx          BPMz          SD2S  ...       
   QP3           SD2           QP4           SD1S          SX2           HCOR  ...       
@@ -153 +155 @@
   SX3           HCOR          VCOR          SD3S          QP31          SD3S ...        
   SX1           HCOR          VCOR          SD3S1         COE           BEND ...         
-  COS           SD31          QP2           SD2           QP1                ....        
+  COS           SD31          QP2           SD2           QP1         BPMx         BPMz      ....        
                 SD5           SD5           BPMx          BPMz          QP1 ...         
   SD2           QP2           SD31          COE           BEND           COS ...         

trunk/machine/THOMX/StorageRing/setoperationalmode.m

@@ -117 +117 @@
     %AO = local_setmagnetcoefficient(AO, @magnetcoefficients);
     %setao(AO);
-% else if ModeNumber == 2
+ elseif ModeNumber == 2
 %     % User mode - nominal lattice 2010 until installation of S11 and S12
-%     AD.OperationalMode = '50e-3 GeV, 3.175 1.64';
-%     AD.Energy = 50e-3; % Make sure this is the same as bend2gev at the production lattice!
-%     ModeName = 'CDR_017_064_r56_02_sx_Dff';
-%     OpsFileExtension = '_CDR_017_064_r56_02_sx_Dff';
-% 
-%     % AT lattice
-%     AD.ATModel = 'CDR_017_064_r56_02_sx_Dff';
-%     eval(AD.ATModel);  %run model for compiler;
-% 
-%     % Golden TUNE is with the TUNE family
-%     AO = getao;
-%     AO.TUNE.Monitor.Golden = [
-%         0.175
-%         0.640
-%         NaN];
-% 
-%     % Golden chromaticity is in the AD (Physics units)
-%     AD.Chromaticity.Golden = [0; 0];
-% 
-%     % Status factory
-%     % don't need for ThomX ?????
-%     %local_set_config_mode('normalconfig120'); d
-%     %AO = local_setmagnetcoefficient(AO, @magnetcoefficients);
-%     %setao(AO);
-
+     AD.OperationalMode = '50e-3 GeV, 3.175 1.64';
+      AD.Energy = 50e-3; % Make sure this is the same as bend2gev at the production lattice!
+      ModeName = 'CDR_017_064_r56_02_sx_Dff_corrSX_BPMIP';
+     OpsFileExtension = '_CDR_017_064_r56_02_sx_Dff_corrSX_BPMIP';
+
+    % AT lattice
+    AD.ATModel = 'CDR_017_064_r56_02_sx_Dff_corrSX_BPMIP';
+    eval(AD.ATModel);  %run model for compiler;
+
+    % Golden TUNE is with the TUNE family
+    AO = getao;
+    AO.TUNE.Monitor.Golden = [
+        0.175
+        0.640
+        NaN];
+
+    % Golden chromaticity is in the AD (Physics units)
+    AD.Chromaticity.Golden = [0; 0];
+
+    % Status factory
+    % don't need for ThomX ?????
+    %local_set_config_mode('normalconfig120'); d
+    %AO = local_setmagnetcoefficient(AO, @magnetcoefficients);
+    %setao(AO);
+
+        
  else
     error('Operational mode unknown');

trunk/machine/THOMX/TL/TLinit.m

@@ -83 +83 @@
 
 
+% AD already been defined in setpathmml.m. Modified by Jianfeng Zhang @ LAL,
+% 17/12/2013
 %Mode             = 'online';
-setad([]);       %clear AcceleratorData memory
-AD.SubMachine    = 'TL'; % Machine Name
-AD.Energy        = 0.05 ; % Energy in GeV
-
-
-setad(AD);   %load AcceleratorData
+%setad([]);       %clear AcceleratorData memory
+%AD.SubMachine    = 'TL'; % Machine Name
+%AD.Energy        = 0.05 ; % Energy in GeV
+
+
+%setad(AD);   %load AcceleratorData
 
 %%%%%%%%%%%%%%%%%%%%

trunk/machine/THOMX/TL/aoinit.m

@@ -3 +3 @@
 %
 %
-%  See Also soleilinit, setpathsoleil 
+%  See Also TLinit, setpaththomx 
 
 % Written by Laurent S. Nadolski
+% Modified by Jianfeng Zhang for ThomX 
 
 

trunk/machine/THOMX/TL/setoperationalmode.m

@@ -42 +42 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 AD = getad;
-AD.Machine = 'THOMX';            % Will already be defined if setpathmml was used
-AD.MachineType = 'StorageRing';   % Will already be defined if setpathmml was used
-AD.SubMachine  = 'TL';           % Will already be defined if setpathmml was used
-AD.OperationalMode = '';          % Gets filled in later
+% Modified by Jianfeng Zhang @ LAL, 17/12/2013
+if(isempty(AD.Machine))
+    AD.Machine = 'THOMX';            % Will already be defined if setpathmml was used
+end
+if(isempty(AD.Machine))
+    AD.MachineType = 'Transport';   % Will already be defined if setpathmml was used
+end
+if(isempty(AD.SubMachine))
+    AD.SubMachine  = 'TL';           % Will already be defined if setpathmml was used
+end
+
+
 
 

trunk/mml/plotcm.m

@@ -113 +113 @@
     end
 
-    % Sector 11
-    %                    Off    1.9 GeV   1.5 GeV
-    % HCMCHICANEM(11,1)  80.0    40.5      52.0
-    % HCMCHICANEM(11,1)  80.0    40.5      52.0
-    % HCM(10,8)           0.0   -17.0     -14.0
-    % HCM(11,1)           0.0   -17.0     -14.0
+    
     ihcm = findrowindex([10 8], x.DeviceList);
     if length(ihcm) == 1

trunk/mml/setpaththomx.m

@@ -7 +7 @@
 % INPUTS
 %  varargin(1):
-%       SubMachineName - 'StorageRing', 'LT','LE'
+%       SubMachineName - 'StorageRing', 'TL','EL'
 %  varagin(2):  
 %       hardware control system: LAbCA, MCA, Tango, 
@@ -110 +110 @@
     %         need to be customized for THOMX
          addpath(fullfile(MMLROOT, 'machine', 'THOMX', 'common', 'plotfamily'));
-%        addpath(fullfile(MMLROOT, 'machine', 'SOLEIL', 'common', 'plotfamily'));
  addpath(fullfile(MMLROOT, 'machine', 'THOMX', 'common', 'configurations'));
-%        addpath(fullfile(MMLROOT, 'machine', 'SOLEIL', 'common', 'configurations'));
-%        addpath(fullfile(MMLROOT, 'machine', 'SOLEIL', 'common', 'cycling'));
+ addpath(fullfile(MMLROOT, 'machine', 'THOMX', 'common', 'cycling'));
 %        addpath(fullfile(MMLROOT, 'machine', 'SOLEIL', 'common', 'diag', 'DserverBPM'));
         addpath(fullfile(MMLROOT, 'applications', 'mmlviewer'));