Changeset 213 for trunk/src/proj_field.m

Timestamp:

Mar 4, 2011, 12:07:38 AM (13 years ago)

Author:

sommeria

Message:

bug corrected for 3D geometry calib: tilt angles

File:

• trunk/src/proj_field.m (modified) (5 diffs)

trunk/src/proj_field.m

@@ -208 +208 @@
       
     else
-        if length(ivar_X)>1 | length(ivar_Y)>1 | length(ivar_Z)>1
+        if length(ivar_X)>1 || length(ivar_Y)>1 || length(ivar_Z)>1
                  errormsg='multiple coordinate input in proj_field.m';
                     return
@@ -238 +238 @@
             test3D=1;
         end
-        if length(ivar_F)>1 | length(ivar_FF)>1 
+        if length(ivar_F)>1 || length(ivar_FF)>1 
                  msgbox_uvmat('ERROR','multiple flag input in proj_field.m')
                     return
@@ -748 +748 @@
             elseif isequal(ProjMode,'filter') %filtering
                 npoint=floor(linelength/DX)+1;% nbre of points in the profile (interval DX)
-                Xproj=[linelength/(2*npoint):linelength/npoint:linelength-linelength/(2*npoint)];
+                Xproj=linelength/(2*npoint):linelength/npoint:linelength-linelength/(2*npoint);
                 siz=size(X_sel);
                 xregij=cos(theta(ip))*Xproj'*ones(1,siz(2))+ObjectData.Coord(ip,1);
@@ -887 +887 @@
                     eval(['ProjData.' VarName{ivar} '=((sum(A_out,1)/npY))'';']);
                 elseif nbcolor==3
-                    vec_B(ind_in,[1:3])=vec_A(ICOMB,:);
+                    vec_B(ind_in,1:3)=vec_A(ICOMB,:);
                     vec_B(ind_out,1)=zeros(size(ind_out));
                     vec_B(ind_out,2)=zeros(size(ind_out));
@@ -1328 +1328 @@
         end
         npX=1+round(abs(Coord{NbDim}(end)-Coord{NbDim}(1))/DX);%nbre of points after interpol 
-        for idim=[1:NbDim]
+        for idim=1:NbDim
             if test_interp(idim)
                 DimValue(idim)=1+round(abs(Coord{idim}(end)-Coord{idim}(1))/abs(DCoord_min(idim)));%nbre of points after possible interpolation on a regular gri