Changeset 971 for trunk/src

Timestamp:

Nov 9, 2016, 7:47:13 PM (8 years ago)

Author:

sommeria

Message:

various

Location:

trunk/src

Files:

• proj_field.m (modified) (2 diffs)
• script_readlvm.m (modified) (1 diff)
• series/extract_multitif.m (modified) (2 diffs)

trunk/src/proj_field.m

@@ -19 +19 @@
 %    .Type : type of projection object
 %    .ProjMode=mode of projection ;
-%    .CoordUnit: 'px', 'cm' units for the coordinates defining the object
+%    .CoordUnit: 'px', 'cm' units for the coordinates defining the
+%    objectuvmat
+
 %    .Angle (  angles of rotation (=[0 0 0] by default)
 %    .ProjAngle=angle of projection;
@@ -1574 +1576 @@
                     ProjData.(AXName)=[coord_x_proj(1) coord_x_proj(end)]; %record the new (projected ) x coordinates
                     [X,YI]=meshgrid(coord_x_proj,coord_y_proj);%grid in the new coordinates
-                    XI=ObjectData.Coord(1,1)+(X)*cos(PlaneAngle(3))-YI*sin(PlaneAngle(3));%corresponding coordinates in the original system
-                    YI=ObjectData.Coord(1,2)+(X)*sin(PlaneAngle(3))+YI*cos(PlaneAngle(3));
+                    XI=ObjectData.Coord(1,1)+(X)*cos(PlaneAngle(2))-YI*sin(PlaneAngle(1));%corresponding coordinates in the original system
+                    YI=ObjectData.Coord(1,2)+(X)*sin(PlaneAngle(2))+YI*cos(PlaneAngle(1));
                     if numel(Coord{1})==2% x coordiante defiend by its bounds, get the whole set
                         Coord{1}=linspace(Coord{1}(1),Coord{1}(2),CellInfo{icell}.CoordSize(1));

trunk/src/script_readlvm.m

@@ -1 +1 @@
 %% get the input file
-project='/fsnet/project/coriolis/2015/15MINI_MEDDY/PROBES';
-if ~exist(project,'dir')
-    project='U:\project\coriolis\2015\15MINI_MEDDY\PROBES';%windows
-end
+project='/fsnet/project/coriolis/2016/16CREST';
+% if ~exist(project,'dir')
+%     project='U:\project\coriolis\2015\15MINI_MEDDY\PROBES';%windows
+% end
 fileinput=uigetfile_uvmat('pick an input file',project);
 [Path,Name,Ext]=fileparts(fileinput);

trunk/src/series/extract_multitif.m

@@ -130 +130 @@
     rank=regexprep(rank,['^' RootName '@'],'');
     if ~isequal(str2num(rank),ilist-1)
-        disp('error in the list of input files')
+        disp(['error in the list of input file # ' num2str(ilist-1)])
         return
     end
@@ -178 +178 @@
 t=struct2xml(XmlInput.Camera);
 t=set(t,1,'name','ImaDoc');
-save(fullfile(Param.InputTable{1,1},'PCO.xml'),t)
+save(t,fullfile(Param.InputTable{1,1},'PCO.xml'))
 
 %% remove initial files if transfer OK