Changeset 782 for trunk/src/transform_field

Timestamp:

Jun 3, 2014, 8:10:03 PM (11 years ago)

Author:

sommeria

Message:

AX and AY changed to Coord_x and Coord_y

Location:

trunk/src/transform_field

Files:

• phys.m (modified) (4 diffs)
• phys_polar.m (modified) (4 diffs)

trunk/src/transform_field/phys.m

@@ -71 +71 @@
     DataOut=phys_1(DataIn,Calib{1},ZIndex);% transform coordiantes and velocity components
     %case of images or scalar: in case of two input fields, we need to project the transform  on the same regular grid
-    if isfield(DataIn,'A') && isfield(DataIn,'AX') && ~isempty(DataIn.AX) && isfield(DataIn,'AY')&&...
-                                           ~isempty(DataIn.AY) && length(DataIn.A)>1
+    if isfield(DataIn,'A') && isfield(DataIn,'Coord_x') && ~isempty(DataIn.Coord_x) && isfield(DataIn,'Coord_y')&&...
+                                           ~isempty(DataIn.Coord_y) && length(DataIn.A)>1
         iscalar=1;
         A{1}=DataIn.A;
@@ -117 +117 @@
         end
     end
-    if isfield(DataIn_1,'A')&&isfield(DataIn_1,'AX')&&~isempty(DataIn_1.AX) && isfield(DataIn_1,'AY')&&...
-            ~isempty(DataIn_1.AY)&&length(DataIn_1.A)>1
+    if isfield(DataIn_1,'A')&&isfield(DataIn_1,'Coord_x')&&~isempty(DataIn_1.Coord_x) && isfield(DataIn_1,'Coord_y')&&...
+            ~isempty(DataIn_1.Coord_y)&&length(DataIn_1.A)>1
         iscalar=iscalar+1;
         Calib{iscalar}=Calib{2};
@@ -127 +127 @@
 %% transform the scalar(s) or image(s)
 if iscalar~=0
-    [A,AX,AY]=phys_Ima(A,Calib,ZIndex);%TODO : introduire interp2_uvmat ds phys_ima
+    [A,Coord_x,Coord_y]=phys_Ima(A,Calib,ZIndex);%TODO : introduire interp2_uvmat ds phys_ima
     if iscalar==1 && ~isempty(DataOut_1) % case for which only the second field is a scalar
          DataOut_1.A=A{1};
-         DataOut_1.AX=AX; 
-         DataOut_1.AY=AY;
+         DataOut_1.Coord_x=Coord_x; 
+         DataOut_1.Coord_y=Coord_y;
     else
         DataOut.A=A{1};
-        DataOut.AX=AX; 
-        DataOut.AY=AY;
+        DataOut.Coord_x=Coord_x; 
+        DataOut.Coord_y=Coord_y;
     end
     if iscalar==2
         DataOut_1.A=A{2};
-        DataOut_1.AX=AX; 
-        DataOut_1.AY=AY;
+        DataOut_1.Coord_x=Coord_x; 
+        DataOut_1.Coord_y=Coord_y;
     end
 end
@@ -146 +146 @@
 % subtract fields
 if ~isempty(DataOut_1)
-DataOut=sub_field(DataOut,[],DataOut_1);
+    DataOut=sub_field(DataOut,[],DataOut_1);
 end
 %------------------------------------------------

trunk/src/transform_field/phys_polar.m

@@ -80 +80 @@
     DataOut=phys_1(Data,Calib{1},origin_xy,radius_offset,angle_offset,angle_scale);
     %case of images or scalar
-    if isfield(Data,'A')&isfield(Data,'AX')&~isempty(Data.AX) & isfield(Data,'AY')&...
-                                           ~isempty(Data.AY)&length(Data.A)>1
+    if isfield(Data,'A')&isfield(Data,'Coord_x')&~isempty(Data.Coord_x) & isfield(Data,'Coord_y')&...
+                                           ~isempty(Data.Coord_y)&length(Data.A)>1
         iscalar=1;
         A{1}=Data.A;
@@ -96 +96 @@
 if test_1
     DataOut_1=phys_1(Data_1,Calib{2},origin_xy,radius_offset,angle_offset,angle_scale);
-    if isfield(Data_1,'A')&isfield(Data_1,'AX')&~isempty(Data_1.AX) & isfield(Data_1,'AY')&...
-                                       ~isempty(Data_1.AY)&length(Data_1.A)>1
+    if isfield(Data_1,'A')&isfield(Data_1,'Coord_x')&~isempty(Data_1.Coord_x) & isfield(Data_1,'Coord_y')&...
+                                       ~isempty(Data_1.Coord_y)&length(Data_1.A)>1
           iscalar=iscalar+1;
           Calib{iscalar}=Calib{2};
@@ -105 +105 @@
           end
           if iscalar==1% case for which only the second field is a scalar
-               [A,AX,AY]=phys_Ima_polar(A,Calib,ZIndex,origin_xy,radius_offset,angle_offset,angle_scale);
+               [A,Coord_x,Coord_y]=phys_Ima_polar(A,Calib,ZIndex,origin_xy,radius_offset,angle_offset,angle_scale);
                DataOut_1.A=A{1};
-               DataOut_1.AX=AX; 
-               DataOut_1.AY=AY;
+               DataOut_1.Coord_x=Coord_x; 
+               DataOut_1.Coord_y=Coord_y;
                return
           end
@@ -114 +114 @@
 end
 if iscalar~=0
-    [A,AX,AY]=phys_Ima_polar(A,Calib,ZIndex,origin_xy,radius_offset,angle_offset,angle_scale);%
+    [A,Coord_x,Coord_y]=phys_Ima_polar(A,Calib,ZIndex,origin_xy,radius_offset,angle_offset,angle_scale);%
     DataOut.A=A{1};
-    DataOut.AX=AX; 
-    DataOut.AY=AY;
+    DataOut.Coord_x=Coord_x; 
+    DataOut.Coord_y=Coord_y;
     if iscalar==2
         DataOut_1.A=A{2};
-        DataOut_1.AX=AX; 
-        DataOut_1.AY=AY;
+        DataOut_1.Coord_x=Coord_x; 
+        DataOut_1.Coord_y=Coord_y;
     end
 end