Changeset 1051 for trunk/src


Ignore:
Timestamp:
Jun 27, 2018, 11:20:37 PM (3 years ago)
Author:
sommeria
Message:

psmsn cluster command updated, pb with multimask solved...

Location:
trunk/src
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/check_files.m

    r1039 r1051  
    167167        svn_info.cur_rev=str2double(t.rev); %version nbre of the current package
    168168    end
    169     [tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat]);
     169    %[tild,result]=system(['svn info -r ''HEAD'' '  pathuvmat]);
     170    [tild,result]=system(['svn info ''HEAD'' '  pathuvmat]);
    170171    t=regexp(result,'R.vision\s*:\s*(?<rev>\d+)','names');
    171172    if ~isempty(t)
  • trunk/src/cluster_command_psmn.m

    r1043 r1051  
    1717function cmd=cluster_command_psmn(ListProcessFile, ActionFullName, DirLog, NbProcess, NbCore, CPUTimeProcess)
    1818    SubmitScriptFile = regexprep(ListProcessFile, '\job_list.txt\>', 'submit_script.sh');
    19     fid_list = fopen(ListProcessFile, 'r');
     19        fid_list = fopen(ListProcessFile, 'r');
    2020    fid_submit = fopen(SubmitScriptFile, 'w');
    2121    i=1;
    22     while(true)
    23         process = fgets(fid_list);
     22        while(true)
     23                process = fgets(fid_list);
    2424        if(process == -1)
    25             break
     25                        break
    2626        end
    2727        n = numel(process);
     
    3131                            '-e ' LogFile ' '...
    3232                            '-o ' LogFile ' '...
    33                             '-q piv_debian '...
     33                            '-q piv_debian* '...
     34                            '-P PIV '...
    3435                            '-N UVmat_' num2str(i) ' '...
    3536                            process char(10)]);
    3637        i=i+1;
    37     end
    38     fclose(fid_list);
     38        end
     39        fclose(fid_list);
    3940    fclose(fid_submit);
    4041    system(['chmod +x ' SubmitScriptFile]);
  • trunk/src/series.m

    r1040 r1051  
    14641464    RunMode=Param.Action.RunMode;
    14651465    Param.Action=rmfield(Param.Action,'RunMode'); % remove from the recorded xml file to avoid interference during ImportConfig
     1466    Param.RunMode=RunMode; % keep track of the mode
    14661467end
    14671468ActionExt='.m'; % default
     
    23212322    set(handles.VelType_title,'Visible','on')
    23222323    FieldList=set_field_list('U','V'); % standard menu for civx data
    2323     %CheckList=1;
     2324    if max(get(handles.FieldName,'Value'))>numel(FieldList)
    23242325    set(handles.FieldName,'Value',1); % velocity vector choice by default
     2326    end
    23252327    if  VelTypeRequest_1 && numel(iview_civ)>=2
    23262328        menu=set_veltype_display(SeriesData.FileInfo{iview_civ(2)}.CivStage,SeriesData.FileType{iview_civ(2)});
  • trunk/src/series/extract_rdvision.m

    r1047 r1051  
    111111%%%%%%%%%%%% STANDARD PART  %%%%%%%%%%%%
    112112%% read input parameters from an xml file if input is a file name (batch mode)
    113 checkrun=1;
     113
    114114if ischar(Param)
    115115    Param=xml2struct(Param);% read Param as input file (batch case)
    116     checkrun=0;
    117 end
     116%     checkrun=0;
     117end
     118disp(Param)
     119checkrun=strcmp(Param.RunMode,'local')
    118120hseries=findobj(allchild(0),'Tag','series');
    119121RUNHandle=findobj(hseries,'Tag','RUN');%handle of RUN button in GUI series
     
    527529
    528530%% adjust Dti
     531if NbDti+1>size(timestamp,1)
     532    NbDti=size(timestamp,1)-1;
     533end
    529534Dti_stamp=(timestamp(1+NbDti,1)-timestamp(1,1))/NbDti;
    530535t=set(t,uid_content_Dti,'value',num2str(Dti_stamp));%corret Dti
  • trunk/src/uvmat.m

    r1049 r1051  
    26152615        RootPath=MaskPath;
    26162616    end
    2617     if mdetect==0
     2617    if mdetect==0 % if no mask is detected in the current folder
    26182618        MaskFullName=uigetfile_uvmat('pick a mask image file:',RootPath,'image');
    26192619        if isempty(MaskFullName)
     
    26332633    else
    26342634        Mask.File=MaskFile{1};
     2635    end
     2636    Mask.NbSlice_i=1;
     2637    Mask.NbSlice_j=1;
     2638    if isempty(j1_series)
     2639        Mask.NbSlice_i=i1_series(1,2,end);
     2640    else
     2641        Mask.NbSlice_j=j1_series(1,end,2);
    26352642    end
    26362643    Mask.Ext=MaskExt;
     
    26572664errormsg=[];%default
    26582665Mask=get(handles.CheckMask,'UserData');
    2659 MaskIndex=1;
    26602666if strcmp(get(handles.z_index,'Visible'),'on')
    2661     MaskIndex=str2num(get(handles.z_index,'String'));
     2667    MaskIndex_i=str2num(get(handles.z_index,'String'));
     2668else
     2669    MaskIndex_i=mod(str2num(get(handles.i1,'String')),Mask.NbSlice_i);
     2670end
     2671if Mask.NbSlice_j>1
     2672    MaskIndex_j=str2num(get(handles.j1,'String'));
     2673else
     2674    MaskIndex_j=1;
    26622675end
    26632676if isfield(Mask,'maskhandle')&& ishandle(Mask.maskhandle)
    26642677    uistack(Mask.maskhandle,'top');
    26652678end
    2666 MaskName=fullfile_uvmat(Mask.Path,'',Mask.File,Mask.Ext,Mask.NomType,MaskIndex);
     2679MaskName=fullfile_uvmat(Mask.Path,'',Mask.File,Mask.Ext,Mask.NomType,MaskIndex_i,[],MaskIndex_j);
    26672680UvData=get(handles.uvmat,'UserData');
    26682681
     
    26892702            return
    26902703        end
    2691         MaskField.ZIndex=MaskIndex;
     2704        MaskField.ZIndex=MaskIndex_i;
    26922705        %px to phys or other transform on field
    26932706         menu_transform=get(handles.TransformName,'String');
Note: See TracChangeset for help on using the changeset viewer.