Changeset 365


Ignore:
Timestamp:
Jan 10, 2012, 8:09:44 PM (9 years ago)
Author:
sommeria
Message:

bugs fixed in civ_uvmat and find_file_series (to deal with letter indices)

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ_matlab.m

    r364 r365  
    205205    ibx2=ceil(par_civ2.Bx/2);
    206206    iby2=ceil(par_civ2.By/2);
    207     isx2=ibx2+2;
    208     isy2=iby2+2;
     207    isx2=ibx2+3;
     208    isy2=iby2+3;
    209209    % shift from par_civ2.filename_nc1
    210210    % shiftx=velocity interpolated at position
     
    250250    par_civ2.Searchx=2*isx2+1;
    251251    par_civ2.Searchy=2*isy2+1;
    252     par_civ2.Shiftx=Shiftx./nbval;
    253     par_civ2.Shifty=Shifty./nbval;
    254     par_civ2.Grid=[GridX GridY];   
     252    par_civ2.Shiftx=Shiftx(nbval>=1)./nbval(nbval>=1);
     253    par_civ2.Shifty=Shifty(nbval>=1)./nbval(nbval>=1);
     254    par_civ2.Grid=[GridX(nbval>=1) GridY(nbval>=1)];   
    255255    if par_civ2.CheckDeformation
    256256        DUDX=DUDX./nbval;
     
    390390isx2=ceil(par_civ.Searchx/2);
    391391isy2=ceil(par_civ.Searchy/2);
    392 shiftx=par_civ.Shiftx;
    393 shifty=-par_civ.Shifty;% sign minus because image j index increases when y decreases
     392shiftx=round(par_civ.Shiftx);
     393shifty=-round(par_civ.Shifty);% sign minus because image j index increases when y decreases
    394394if isfield(par_civ,'Grid')
    395395    if ischar(par_civ.Grid)%read the drid file if the input is a file name
     
    412412nbvec=size(par_civ.Grid,1);
    413413if numel(shiftx)==1
    414     shiftx=round(shiftx)*ones(nbvec,1);
    415     shifty=round(shifty)*ones(nbvec,1);
     414    shiftx=shiftx*ones(nbvec,1);
     415    shifty=shifty*ones(nbvec,1);
    416416end
    417417%% Default output
  • trunk/src/find_file_series.m

    r362 r365  
    145145            j1_star='*';
    146146            if ~isempty(regexp(NomTypeStr,'[b|B]$'));
    147                 j2_str='(?<j1>[a-z]|[A-Z])';
     147                j2_str='(?<j2>[a-z]|[A-Z])';
    148148                j2_star='*';
    149149            end
Note: See TracChangeset for help on using the changeset viewer.