Changeset 1085 for trunk


Ignore:
Timestamp:
Aug 11, 2020, 8:06:46 PM (3 months ago)
Author:
sommeria
Message:

aver_spectral added andsmall bug repairs

Location:
trunk/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/find_field_cells.m

    r1083 r1085  
    155155for iscalar=1:numel(ind_scalar)
    156156    icell=[];
    157     for iprev=1:numel(DimCell)-1
     157    for iprev=1:numel(DimCell)
    158158        if isequal(DimCell{iprev},Data.VarDimName{ind_scalar(iscalar)})
    159159            icell=iprev;
  • trunk/src/phys_ima.m

    r1078 r1085  
    6666        % the image needs to be interpolated to the new coordinates
    6767        Z=0; %default
    68         if isfield(Calib,'SliceCoord') %.Z= index of plane
     68        if isfield(Calib,'SliceCoord')&& size(Calib.SliceCoord,1)>=ZIndex %.Z= index of plane
    6969            SliceCoord=Calib.SliceCoord(ZIndex,:);
    7070            Z=SliceCoord(3);
  • trunk/src/proj_field.m

    r1084 r1085  
    672672    %identify error flag
    673673    errorflag=0; %default, no error flag
    674     if isfield(CellInfo{icell},'VarIndex_errorflag');% test for error flag
     674    if isfield(CellInfo{icell},'VarIndex_errorflag')% test for error flag
    675675        FFName=FieldData.ListVarName{CellInfo{icell}.VarIndex_errorflag};
    676676        errorflag=FieldData.(FFName);
  • trunk/src/series.m

    r1084 r1085  
    20932093            % create file containing the list of jobs
    20942094            ListProcess=fullfile(DIR_CLUSTER,'job_list.txt'); % name of the file containing the list of executables
    2095             fid=fopen(ListProcess,'w'); % open it for writting
     2095            [fid,errormsg]=fopen(ListProcess,'w'); % open it for writting
     2096            if isempty(errormsg)
    20962097            for iprocess=1:length(batch_file_list)
    20972098                fprintf(fid,[batch_file_list{iprocess} '\n']); % write list of exe files
     
    20992100            fclose(fid);
    21002101            system(['chmod +x ' ListProcess]); % set the file to executable
    2101            
     2102            else
     2103                errormsg=['error for writting the executable file:' errormsg];
     2104            end       
    21022105            CPUTimeProcess=CPUTime*BlockLength*nbfield_j; % estimated CPU time for one individual process (in minutes)
    21032106            LaunchCmdFcn=SeriesData.SeriesParam.ClusterParam.LaunchCmdFcn;
  • trunk/src/series/time_series.m

    r1071 r1085  
    8181    hhseries=guidata(hseries);
    8282    if  ~isfield(Param,'ProjObject')
    83         answer=msgbox_uvmat('INPUT_Y-N','use a projection object for the time_series?');
    84         if strcmp(answer,'Yes')
    85             set(hhseries.CheckObject,'Visible','on')
    86             set(hhseries.CheckObject,'Value',1)
    87             series('CheckObject_Callback',hseries,[],hhseries); %file input with xml reading  in uvmat, show the image in phys coordinates
    88         end
     83        msgbox_uvmat('WARNING','you may need to introduce a projection object for the time_series');
    8984    end
    9085   
Note: See TracChangeset for help on using the changeset viewer.