Changeset 161 for trunk/src/transform_field

Timestamp:

Dec 23, 2010, 8:53:48 AM (14 years ago)

Author:

sommeria

Message:

bug corrected in phys_polar (CoordType? not used anymore)

File:

• trunk/src/transform_field/phys_polar.m (modified) (1 diff)

trunk/src/transform_field/phys_polar.m

@@ -113 +113 @@
 end
 
+
+
+
 %------------------------------------------------
 function DataOut=phys_1(Data,Calib,origin_xy,radius_offset,angle_offset,angle_scale)
 
 DataOut=Data;
-DataOut.CoordType='phys'; %put flag for physical coordinates
-if isfield(Calib,'CoordUnit')
-    DataOut.CoordUnit=Calib.CoordUnit;
-else
-    DataOut.CoordUnit='cm'; %default
-end
-DataOut.TimeUnit='s';
-%perform a geometry transform if Calib contains a field .GeometryCalib 
-if isfield(Data,'CoordType') && isequal(Data.CoordType,'px') && ~isempty(Calib)
-    if isfield(Data,'CoordUnit')
-         DataOut=rmfield(DataOut,'CoordUnit');
-    end
+DataOut.CoordUnit=Calib.CoordUnit; %put flag for physical coordinates
+if isfield(Calib,'SliceCoord')
+    DataOut.PlaneCoord=Calib.SliceCoord;%to generalise for any plane 
+end
+
+if isfield(Data,'CoordUnit')%&& isequal(Data.CoordType,'px')&& ~isempty(Calib)
+    if isfield(Calib,'CoordUnit')
+        DataOut.CoordUnit=Calib.CoordUnit;
+    else
+        DataOut.CoordUnit='cm'; %default
+    end
+    DataOut.TimeUnit='s';
     %transform of X,Y coordinates for vector fields
-    if isfield(Data,'ZIndex')&~isempty(Data.ZIndex)
+    if isfield(Data,'ZIndex') && ~isempty(Data.ZIndex)&&~isnan(Data.ZIndex)
         Z=Data.ZIndex;
     else