Changeset 1085

Timestamp:

Aug 11, 2020, 8:06:46 PM (4 years ago)

Author:

sommeria

Message:

aver_spectral added andsmall bug repairs

Location:

trunk/src

Files:

• find_field_cells.m (modified) (1 diff)
• phys_ima.m (modified) (1 diff)
• proj_field.m (modified) (1 diff)
• series.m (modified) (2 diffs)
• series/aver_spectral.m (added)
• series/time_series.m (modified) (1 diff)

trunk/src/find_field_cells.m

@@ -155 +155 @@
 for iscalar=1:numel(ind_scalar) 
     icell=[];
-    for iprev=1:numel(DimCell)-1
+    for iprev=1:numel(DimCell)
         if isequal(DimCell{iprev},Data.VarDimName{ind_scalar(iscalar)})
             icell=iprev;

trunk/src/phys_ima.m

@@ -66 +66 @@
         % the image needs to be interpolated to the new coordinates
         Z=0; %default
-        if isfield(Calib,'SliceCoord') %.Z= index of plane
+        if isfield(Calib,'SliceCoord')&& size(Calib.SliceCoord,1)>=ZIndex %.Z= index of plane
             SliceCoord=Calib.SliceCoord(ZIndex,:);
             Z=SliceCoord(3);

trunk/src/proj_field.m

@@ -672 +672 @@
     %identify error flag
     errorflag=0; %default, no error flag
-    if isfield(CellInfo{icell},'VarIndex_errorflag');% test for error flag
+    if isfield(CellInfo{icell},'VarIndex_errorflag')% test for error flag
         FFName=FieldData.ListVarName{CellInfo{icell}.VarIndex_errorflag};
         errorflag=FieldData.(FFName);

trunk/src/series.m

@@ -2093 +2093 @@
             % create file containing the list of jobs
             ListProcess=fullfile(DIR_CLUSTER,'job_list.txt'); % name of the file containing the list of executables
-            fid=fopen(ListProcess,'w'); % open it for writting
+            [fid,errormsg]=fopen(ListProcess,'w'); % open it for writting
+            if isempty(errormsg)
             for iprocess=1:length(batch_file_list)
                 fprintf(fid,[batch_file_list{iprocess} '\n']); % write list of exe files
@@ -2099 +2100 @@
             fclose(fid);
             system(['chmod +x ' ListProcess]); % set the file to executable
-            
+            else
+                errormsg=['error for writting the executable file:' errormsg];
+            end       
             CPUTimeProcess=CPUTime*BlockLength*nbfield_j; % estimated CPU time for one individual process (in minutes)
             LaunchCmdFcn=SeriesData.SeriesParam.ClusterParam.LaunchCmdFcn;

trunk/src/series/time_series.m

@@ -81 +81 @@
     hhseries=guidata(hseries);
     if  ~isfield(Param,'ProjObject')
-        answer=msgbox_uvmat('INPUT_Y-N','use a projection object for the time_series?');
-        if strcmp(answer,'Yes')
-            set(hhseries.CheckObject,'Visible','on')
-            set(hhseries.CheckObject,'Value',1)
-            series('CheckObject_Callback',hseries,[],hhseries); %file input with xml reading  in uvmat, show the image in phys coordinates
-        end
+        msgbox_uvmat('WARNING','you may need to introduce a projection object for the time_series');
     end