Changeset 20 in MML

Timestamp:

Feb 11, 2014, 2:10:29 PM (11 years ago)

Author:

zhangj

Message:

test...

Location:

trunk

Files:

• machine/THOMX/StorageRing/thomxringgui.fig (modified) (previous)
• machine/THOMX/TL/TLsetup.m (modified) (1 diff)
• machine/THOMX/common/plotfamily (deleted)
• mml/setpathmml.m (modified) (2 diffs)

trunk/machine/THOMX/TL/TLsetup.m

@@ -55 +55 @@
 % same programme for TL cycling
 set(b1(3), 'Callback','disp([''   TLcycling;'']);TLcycling', 'String','Cyclage','ForegroundColor','r');
-% need to customized the synchrotronizer for ThomX
-set(b1(4), 'Callback','disp([''   Timing;'']); synchro_injecteur7;', 'String','Synchronisation définitive');
+
 set(b2(1), 'Callback','optics_TL;', 'String','OPTIQUE','ForegroundColor','r');
-%need to customized for ThomX 
-set(b2(2), 'Callback','disp([''   Emittance'']);emittance_v15;', 'String','Emittance');
+
 
 b = uicontrol('Parent',a, ...

trunk/mml/setpathmml.m

@@ -18 +18 @@
 %
 
+% Modified by Jianfeng Zhang @ 30/01/2014
+%    Add the definition of machine type for "TL" & "EL".
+
+
 % Inputs:  MachineName, SubMachineName, MachineType, LinkFlag, MMLROOT
 
@@ -110 +114 @@
 end
 if isempty(MachineType)
-    switch upper(SubMachineName)
-        case {'LTB', 'LB', 'BTS', 'BS', 'LT1', 'LT2'}
+    switch upper(SubMachineName)   % modified by Jianfeng Zhang @ 30/01/2014 for "TL"&"EL"
+        case {'LTB', 'LB', 'BTS', 'BS', 'LT1', 'LT2','TL','EL'}
             MachineType = 'Transport';
         case {'BOOSTER', 'BOOSTER RING', 'BR'}