Changeset 32 in MML for trunk

Timestamp:

Apr 9, 2014, 6:01:33 PM (10 years ago)

Author:

zhangj

Message:

To display the orbits but not 6D coordinates at the BPMs of the transfer line.

Location:

trunk

Files:

• machine/THOMX/readme (modified) (1 diff)
• mml/at/getpvmodel.m (modified) (3 diffs)

trunk/machine/THOMX/readme

@@ -70 +70 @@
 ----
 09/04/2014 
+(1)
     Test the machine mode in TLinit.m & thomxinit.m
 
 This is a very important command!!!!!!!!!!!
+
+
+(2) Need to set the crunch & roll parameters of BPMs in the future...
+
 -----

trunk/mml/at/getpvmodel.m

@@ -67 +67 @@
 % Jianfeng Zhang @ LAL, 09/04/2014
 %  Get the correct orbits at the position of BPMs in the transfer line.
-%
+%  Maybe there is a potential bug for the multi-turn pass of the transfer line???
 %%
 
@@ -260 +260 @@
 
 submachinetype = getfamilydata('SubMachine');
-if(any(strcmpi(Family,{'BPMx','BPMz','BPMx'}))&&...
+if(any(strcmpi(Family,{'BPMx','BPMz','BPMy'}))&&...
         any(strcmpi(submachinetype,{'TL','Transport'})))
 
@@ -999 +999 @@
             %AM = AM + 1e-3*randn(length(AM),1);
 
+            
+            
+            %
+            % Modified by Jianfeng Zhang @ LAL, 09/04/2014
+            % to get the correct orbit of the BPMs at the transfer line
+            % using the functions: getam('BPMx/z') & getx/y.
+            % 
+            % Need to set the corrector crunch & roll values of the BPMs
+            % in the future...
+            %
+            % get the horizontal orbit at the horizontal BPM
+           if(any(strcmpi(Family,{'BPMx'}))&&...
+            any(strcmpi(submachinetype,{'TL','Transport'})))
+                       % Roll and Crunch are corrected here (BPM gain errors are corrected in real2raw/raw2real)
+               
+                       % Only corrector for gain/roll errors is using a ML family
+                       % Roll and Crunch are corrected here (BPM gain errors are corrected in real2raw/raw2real)
+
+                        [ATIndexList, isort] = sort(ATIndexList);
+                    
+                    NDevices = length(ATIndexList);
+                    for i = 1:NDevices,
+                        if isfield(THERING{ATIndexList(i)}, 'GCR')
+                            GCR(i,:) = THERING{ATIndexList(i)}.GCR;
+                        else
+                            if GCRFlag
+                                if i == 1 
+                                    Crunch = getcrunch(Family, Field, DeviceList);
+                                    Roll = getroll(Family, Field, DeviceList);
+                                end
+                                m = gcr2loco(1, 1, Crunch(i), Roll(i));
+                                GCR(i,:) = [1 1 Crunch(i) Roll(i)]; 
+                            else % Laurent
+                                GCR(i,:) = [1 1 0 0];
+                            end
+                        end
+                    end
+
+                    x = AM(:,:,1); %meters
+                    y = AM(:,:,3); %meters
+                    
+                   
+                    if NoiseFlag
+                        x = x + randncut(size(x))*BPMsigma;
+                        y = y + randncut(size(y))*BPMsigma;
+                    end
+
+                    AM = ((x - GCR(:,3) .* y) .* cos(GCR(:,4)) + (y + GCR(:,3) .* x) .* sin(GCR(:,4))) ./ sqrt(1-GCR(:,3).^2);
+
+                    % Same as:
+                    %Crunch = GCR(:,3);
+                    %Roll = GCR(:,4);
+                    %a = ( Crunch .* sin(Roll) + cos(Roll)) ./ sqrt(1 - Crunch.^2);
+                    %b = (-Crunch .* cos(Roll) + sin(Roll)) ./ sqrt(1 - Crunch.^2);
+                    %AM = a .* x + b .* y;
+%                 else
+%                     AM = Orbit(1,:)';
+%                
+            
+    AM(isort,:) = AM;
+
+           end
+            
+           
+        
+                    
+       % get the vertical orbit at the bpms of the transfer line
+if(any(strcmpi(Family,{'BPMz','BPMy'}))&&...
+        any(strcmpi(submachinetype,{'TL','Transport'})))
+              %  if isfamily(Family, Field)
+                    % Only corrector for gain/roll errors is using a ML family
+                    % Roll and Crunch are corrected here (BPM gain errors are corrected in real2raw/raw2real)
+                 
+                    [ATIndexList, isort] = sort(ATIndexList);
+                    
+                    for i = 1:length(ATIndexList)
+                        if isfield(THERING{ATIndexList(i)}, 'GCR')
+                            GCR(i,:) = THERING{ATIndexList(i)}.GCR;
+                        else
+                            if GCRFlag
+                                GCR(i,:) = [1 1 0 0];  % [Gx Gy Crunch Roll]
+                                if i == 1
+                                    Crunch = getcrunch(Family, Field, DeviceList); %Laurent
+                                    Roll = getroll(Family, Field, DeviceList); % Laurent
+                                end
+                                m = gcr2loco(1, 1, Crunch(i), Roll(i));
+                                GCR(i,:) = [1 1 Crunch(i) Roll(i)];
+                            else % Laurent
+                                GCR(i,:) = [1 1 0 0];
+                            end
+                        end
+                    end
+
+                    x = AM(:,:,1);
+                    y = AM(:,:,3);
+                    
+                    if NoiseFlag
+                        x = x + randn(size(x))*1e-7;
+                        y = y + randn(size(y))*1e-7;
+                    end
+
+
+                    AM = ((y - GCR(:,3) .* x) .* cos(GCR(:,4)) - (x + GCR(:,3) .* y) .* sin(GCR(:,4))) ./ sqrt(1-GCR(:,3).^2);
+
+                    % Same as:
+                    %Crunch = GCR(:,3);
+                    %Roll = GCR(:,4);
+                    %c = (-Crunch .* cos(Roll) - sin(Roll)) ./ sqrt(1 - Crunch.^2);
+                    %d = (-Crunch .* sin(Roll) + cos(Roll)) ./ sqrt(1 - Crunch.^2);
+                    %AM = c .* x + d .* y;
+%                 else
+%                     AM = Orbit(3,:)';
+%                 end
+%             elseif strcmpi(AT.ATType, 'ClosedOrbit')
+%                     AM = Orbit';
+%             end
+
+      
+
+
+             AM(isort,:) = AM;
+
+end       
+            
+            
+            
+            
         elseif strcmpi(AT.ATType, 'Septum')