Changeset 595 for trunk/src/series

Timestamp:

Mar 29, 2013, 9:03:29 PM (12 years ago)

Author:

sommeria

Message:

steps further to use series with cluster. Some bsolete functions removed

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (4 diffs)
• merge_proj.m (modified) (3 diffs)

trunk/src/series/aver_stat.m

@@ -89 +89 @@
 % i1_series(iview,fileindex) expresses the same indices as a 1D array in file indices
 %%%%%%%%%%%%
-NbSlice=1;%default
-if isfield(Param.IndexRange,'NbSlice')&&~isempty(Param.IndexRange.NbSlice)
-    NbSlice=Param.IndexRange.NbSlice;
-end
+% NbSlice=1;%default
+% if isfield(Param.IndexRange,'NbSlice')&&~isempty(Param.IndexRange.NbSlice)
+%     NbSlice=Param.IndexRange.NbSlice;
+% end
 nbview=numel(i1_series);%number of input file series (lines in InputTable)
 nbfield_j=size(i1_series{1},1); %nb of fields for the j index (bursts or volume slices)
 nbfield_i=size(i1_series{1},2); %nb of fields for the i index
 nbfield=nbfield_j*nbfield_i; %total number of fields
-nbfield_i=floor(nbfield/NbSlice);%total number of  indexes in a slice (adjusted to an integer number of slices) 
-nbfield=nbfield_i*NbSlice; %total number of fields after adjustement
+%nbfield_i=floor(nbfield/NbSlice);%total number of  indexes in a slice (adjusted to an integer number of slices) 
+%nbfield=nbfield_i*NbSlice; %total number of fields after adjustement
 
 %determine the file type on each line from the first input file 
@@ -173 +173 @@
 
 %% MAIN LOOP ON SLICES
-for i_slice=1:NbSlice
-    index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
+% for i_slice=1:NbSlice
+   % index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice
     nbfiles=0;
     nbmissing=0;
 
     %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
-    for index=index_slice
+    for index=1:nbfield
+    %for index=index_slice
           if checkrun
                 stopstate=get(Param.RUNHandle,'BusyAction');
@@ -305 +306 @@
     
     %writting the result file
-    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(1),i1_series{1}(end),i_slice,[]);
+    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFile{1},FileExtOut,NomTypeOut,i1_series{1}(1),i1_series{1}(end),j1_series{1}(1),j1_series{1}(end));
     if CheckImage{1} %case of images
         if isequal(FileInfo{1}.BitDepth,16)||(numel(FileInfo)==2 &&isequal(FileInfo{2}.BitDepth,16))
@@ -324 +325 @@
         end
     end  % end averaging  loop
-end
+% end
 %%%%%%%%%%%%%%%% end loop on slices %%%%%%%%%%%%%%%%
 

trunk/src/series/merge_proj.m

@@ -63 +63 @@
 
 %%%%%%%%%%%% STANDARD PART (DO NOT EDIT) %%%%%%%%%%%%
+
+
 %% read input parameters from an xml file if input is a file name (batch mode)
 checkrun=1;
@@ -157 +159 @@
 end
 NomTypeOut=NomType;% output file index will indicate the first and last ref index in the series
-if checkrun==1
-    ParamOut.Specific=[];%no specific parameter
-    return %stop here for interactive input (option Param.Specific='?')
-end
+% if checkrun==1
+%     ParamOut.Specific=[];%no specific parameter
+%     return %stop here for interactive input (option Param.Specific='?')
+% end
 
 %% Set field names and velocity types
@@ -174 +176 @@
     %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
     for index=index_slice
-  
         if checkrun
-            update_waitbar(hseries.Waitbar,index/(nbfield))
-            stopstate=get(hseries.RUN,'BusyAction');
+            stopstate=get(Param.RUNHandle,'BusyAction');
+            update_waitbar(Param.WaitbarHandle,index/nbfield)
         else
             stopstate='queue';
         end
-        
+        if ~isequal(stopstate,'queue')% enable STOP command
+            return
+        end
         %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
         Data=cell(1,nbview);%initiate the set Data