Changeset 984 for trunk/src/series


Ignore:
Timestamp:
Jan 18, 2017, 3:37:05 PM (7 years ago)
Author:
sommeria
Message:

introduce .cine in various functions, improve stero PIV

Location:
trunk/src/series
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/series/aver_stat.m

    r977 r984  
    167167
    168168%% determine the file type on each line from the first input file
    169 ImageTypeOptions={'image','multimage','mmreader','video'};
     169ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    170170NcTypeOptions={'netcdf','civx','civdata'};
    171171for iview=1:NbView

  • trunk/src/series/beam_forming.m

    r977 r984  
    9393
    9494%% determine the file type on each line from the first input file
    95 ImageTypeOptions={'image','multimage','mmreader','video'};
     95ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    9696NcTypeOptions={'netcdf','civx','civdata'};
    9797for iview=1:NbView

  • trunk/src/series/check_data_files.m

    r977 r984  
    108108
    109109%determine the file type on each line from the first input file
    110 ImageTypeOptions={'image','multimage','mmreader','video'};
     110ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    111111NcTypeOptions={'netcdf','civx','civdata'};
    112112for iview=1:nbview

  • trunk/src/series/check_peaklock.m

    r977 r984  
    125125
    126126%determine the file type on each line from the first input file
    127 ImageTypeOptions={'image','multimage','mmreader','video'};
     127ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    128128NcTypeOptions={'netcdf','civx','civdata'};
    129129for iview=1:nbview
    … …  
    528528Integ(izero)=min(Integ(inonzero));
    529529aa=log(Integ);%initial guess for a coeff
    530 spli=spline4(aa,mini,nbb);  %appel à la fonction spline4
     530spli=spline4(aa,mini,nbb);  %appel ï¿œ la fonction spline4
    531531histsmooth=exp(spli);
    532532
    … …  
    581581
    582582%data
    583 % n=10;% résolution de la pdf: nbre de points par unite de u
     583% n=10;% rï¿œsolution de la pdf: nbre de points par unite de u
    584584% mini=-10.0;%general mini=uint16(min(values)-1 CHOOSE maxi-mini+1 EVEN
    585585% maxi=9.0; % general maxi=uint16(max(values))+1
    … …  
    588588nint=siz(2);
    589589maxi=mini+nint-1;
    590 npdf=nint*n;% nbre total d'intervals à introduire dans la pdf: hist(u,npdf)
     590npdf=nint*n;% nbre total d'intervals ï¿œ introduire dans la pdf: hist(u,npdf)
    591591%simulation de pdf
    592592xfin=[mini-0.5+1/(2*n):(1/n):maxi+0.5-(1/(2*n))];% valeurs d'interpolation: we take n values in each integer interval

  • trunk/src/series/civ2vel_3C.m

    r981 r984  
    335335    for iview=1:2
    336336        %% reading PIV input file(s)
    337         [Data{iview},tild,errormsg]=read_civdata(filecell{iview,field_index},{'vec(U,V)'},'*');
     337        [Data{iview},tild,errormsg]=read_civdata(filecell{iview,field_index},{'vec(U,V)'},Param.InputFields.VelType);
    338338        if ~isempty(errormsg)
    339339            disp_uvmat('ERROR',['ERROR in civ2vel_3C/read_field/' errormsg],checkrun)

  • trunk/src/series/float_tracking.m

    r977 r984  
    2020% global hfig1 hfig2 scalar
    2121% global Abackg nbpart lum diam
    22 %%%%%%%%%%%%%%ù
     22%%%%%%%%%%%%%%ï¿œ
    2323%
    2424%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
    … …  
    147147[FileInfo,VideoObject]=get_file_info(filecell{1,1});
    148148FileType=FileInfo.FileType;
    149 ImageTypeOptions={'image','multimage','mmreader','video'};
     149ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    150150if isempty(find(strcmp(FileType,ImageTypeOptions)))
    151151    disp('input file not images')

  • trunk/src/series/ima_threshold.m

    r977 r984  
    154154[FileInfo,VideoObject]=get_file_info(filecell{1,1});
    155155FileType=FileInfo.FileType;
    156 ImageTypeOptions={'image','multimage','mmreader','video'};
     156ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    157157if isempty(find(strcmp(FileType,ImageTypeOptions)))
    158158    disp('input file not images')

  • trunk/src/series/merge_proj.m

    r977 r984  
    134134
    135135%% determine the file type on each line from the first input file
    136 ImageTypeOptions={'image','multimage','mmreader','video'};
     136ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    137137NcTypeOptions={'netcdf','civx','civdata'};
    138138for iview=1:NbView

  • trunk/src/series/merge_proj_polar.m

    r977 r984  
    162162
    163163%% determine the file type on each line from the first input file
    164 ImageTypeOptions={'image','multimage','mmreader','video'};
     164ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    165165NcTypeOptions={'netcdf','civx','civdata'};
    166166for iview=1:NbView

  • trunk/src/series/merge_proj_polar_multifile.m

    r977 r984  
    165165
    166166%% determine the file type on each line from the first input file
    167 ImageTypeOptions={'image','multimage','mmreader','video'};
     167ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    168168NcTypeOptions={'netcdf','civx','civdata'};
    169169for iview=1:NbView

  • trunk/src/series/merge_proj_polar_singlefile.m

    r977 r984  
    212212
    213213%% determine the file type on each line from the first input file
    214 ImageTypeOptions={'image','multimage','mmreader','video'};
     214ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    215215NcTypeOptions={'netcdf','civx','civdata'};
    216216for iview=1:NbView

  • trunk/src/series/particle_tracking.m

    r977 r984  
    2020% global hfig1 hfig2 scalar
    2121% global Abackg nbpart lum diam
    22 %%%%%%%%%%%%%%ù
     22%%%%%%%%%%%%%%ï¿œ
    2323%
    2424%%%%%%%%%%% GENERAL TO ALL SERIES ACTION FCTS %%%%%%%%%%%%%%%%%%%%%%%%%%%
    … …  
    147147[FileInfo,VideoObject]=get_file_info(filecell{1,1});
    148148FileType=FileInfo.FileType;
    149 ImageTypeOptions={'image','multimage','mmreader','video'};
     149ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    150150if isempty(find(strcmp(FileType,ImageTypeOptions)))
    151151    disp('input file not images')

  • trunk/src/series/stereo_civ.m

    r977 r984  
    244244
    245245%% get timing from input video
    246 if isempty(time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input
     246if isempty(time) && ~isempty(find(strcmp(FileType_A,{'mmreader','video','cine_phantom'})))% case of video input
    247247    time=zeros(FileInfo_A.NumberOfFrames+1,2);
    248248    time(:,2)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate)';

  • trunk/src/series/stereo_input.m

    r977 r984  
    111111iview_image=1;%line # for the input images
    112112switch FileType
    113     case {'image','multimage','video','mmreader','netcdf'}
     113    case {'image','multimage','video','mmreader','cine_phantom','netcdf'}
    114114%         NomTypeImaA=NomTypeInput;
    115115%         iview_image=1;%line # for the input images

  • trunk/src/series/sub_background.m

    r977 r984  
    107107
    108108    %% check the validity of  input file types
    109     ImageTypeOptions={'image','multimage','mmreader','video'};%allowed input file types(images)
     109    ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};%allowed input file types(images)
    110110    FileInfo=get_file_info(FirstFileName);
    111111    FileType=FileInfo.FileType;

  • trunk/src/series/time_series.m

    r977 r984  
    170170
    171171%% determine the file type on each line from the first input file
    172 ImageTypeOptions={'image','multimage','mmreader','video'};
     172ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    173173NcTypeOptions={'netcdf','civx','civdata'};
    174174FileType=cell(1,NbView);

  • trunk/src/series/turb_correlation.m

    r977 r984  
    114114
    115115%% determine the file type on each line from the first input file
    116 ImageTypeOptions={'image','multimage','mmreader','video'};
     116ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    117117NcTypeOptions={'netcdf','civx','civdata'};
    118118for iview=1:NbView

  • trunk/src/series/turb_stat.m

    r977 r984  
    114114
    115115%% determine the file type on each line from the first input file
    116 ImageTypeOptions={'image','multimage','mmreader','video'};
     116ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    117117NcTypeOptions={'netcdf','civx','civdata'};
    118118for iview=1:NbView

  • trunk/src/series/usr_fct/merge_proj_images.m

    r977 r984  
    6060
    6161%% set the input elements needed on the GUI series when the function is selected in the menu ActionName or InputTable refreshed
    62 ImageTypeOptions={'image','multimage','mmreader','video'};
     62ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    6363if isstruct(Param) && isequal(Param.Action.RUN,0)
    6464    ParamOut.AllowInputSort='off';% allow alphabetic sorting of the list of input file SubDir (options 'off'/'on', 'off' by default)
    … …  
    141141
    142142%% determine the file type on each line from the first input file
    143 ImageTypeOptions={'image','multimage','mmreader','video'};
     143ImageTypeOptions={'image','multimage','mmreader','video','cine_phantom'};
    144144NcTypeOptions={'netcdf','civx','civdata'};
    145145for iview=1:NbView
Note: See TracChangeset for help on using the changeset viewer.