Changeset 93 for trunk/src/transform_field

Timestamp:

May 27, 2010, 7:25:58 PM (14 years ago)

Author:

sommeria

Message:

FFT: improved to deal with NaN data
merge_proj: corrected to reproduce dt if unique
uvmat.fig: tooltip corrected
plot_field: bug for isocontour corrected,
im_filter: cleaning
phys_polar: spatial derivative included (still to check)
set_obeject.fig: minor correction
struct2nc: comments improved
uvmat: button NB implemented
read_civxdata: error message improved

Location:

trunk/src/transform_field

Files:

• im_filter.m (modified) (1 diff)
• phys_polar.m (modified) (4 diffs)

trunk/src/transform_field/im_filter.m

@@ -11 +11 @@
 
 DataOut=DataIn; %default
-
 Atype=class(DataIn.A)% detect integer 8 or 16 bits
-DataOut.A=filter2(Mfiltre,DataIn.A); 
-DataOut.A=feval(Atype,DataOut.A);
+if numel(size(DataIn.A))==3
+    DataOut.A=filter2(Mfiltre,sum(DataIn.A,3));%filter the input image, after summation on the color component (for color images)
+    DataOut.A=uint16(DataOut.A); %transform to 16 bit images
+else
+    DataOut.A=filter2(Mfiltre,DataIn.A)
+    DataOut.A=feval(Atype,DataOut.A);%transform to the initial image format
+end
  

trunk/src/transform_field/phys_polar.m

@@ -28 +28 @@
 end
 test_1=0;
-if nargin==4
+if nargin==4% case of two input fields
     test_1=1;
     Data_1=varargin{3};
@@ -65 +65 @@
 
 iscalar=0;
+%transform first field to cartesian phys coordiantes
 if  ~isempty(Calib{1})
     DataOut=phys_1(Data,Calib{1},origin_xy,radius_offset,angle_offset,angle_scale);
@@ -80 +81 @@
     end
 end
-
+%transform second field (if exists) to cartesian phys coordiantes
 if test_1
     DataOut_1=phys_1(Data_1,Calib{2},origin_xy,radius_offset,angle_offset,angle_scale);
@@ -153 +154 @@
             DataOut.V=(-UX.*sin(theta)+VY.*cos(theta));%./(DataOut.X)%+radius_ref);%angular velocity calculated 
             %shift and renormalize the angular velocity
+            end
+        end
+        %transform of spatial derivatives
+        if isfield(Data,'X') && ~isempty(Data.X) && isfield(Data,'DjUi') && ~isempty(Data.DjUi)...
+                && isfield(Data,'dt')
+            if ~isempty(Data.dt)
+                % estimate the Jacobian matrix DXpx/DXphys
+                for ip=1:length(Data.X)
+                    [Xp1,Yp1]=phys_XYZ(Calib,Data.X(ip)+0.5,Data.Y(ip),Z);
+                    [Xm1,Ym1]=phys_XYZ(Calib,Data.X(ip)-0.5,Data.Y(ip),Z);
+                    [Xp2,Yp2]=phys_XYZ(Calib,Data.X(ip),Data.Y(ip)+0.5,Z);
+                    [Xm2,Ym2]=phys_XYZ(Calib,Data.X(ip),Data.Y(ip)-0.5,Z);
+                    %Jacobian matrix DXpphys/DXpx
+                    DjXi(1,1)=(Xp1-Xm1);
+                    DjXi(2,1)=(Yp1-Ym1);
+                    DjXi(1,2)=(Xp2-Xm2);
+                    DjXi(2,2)=(Yp2-Ym2);
+                    DjUi(:,:)=Data.DjUi(ip,:,:);
+                    DjUi=(DjXi*DjUi')/DjXi;% =J-1*M*J , curvature effects (derivatives of J) neglected
+                    DataOut.DjUi(ip,:,:)=DjUi';
+                end
+                DataOut.DjUi =  DataOut.DjUi/Data.dt;   %     min(Data.DjUi(:,1,1))=DUDX
             end
         end