Skip to content

Update calculateMovieDisplacementField.m #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waddahmoghram wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update calculateMovieDisplacementField.m #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions software/calculateMovieDisplacementField.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,15 +445,16 @@ function calculateMovieDisplacementField(movieData,varargin)

[pivData] = pivAnalyzeImagePair(refFrame,currImage,pivData,pivPar);
validV = ~isnan(pivData.V);


%------ Modified by Waddah I Moghram on 4/7/2019. Added (validV)
if ~p.trackSuccessively
displField(j).pos=[pivData.X(validV), pivData.Y(validV)];
displField(j).vec=[pivData.U(validV)+residualT(j,2), pivData.V(validV)+residualT(j,1)]; % residual should be added with oppiste order! -SH 072514
else
v2 = [pivData.U, pivData.V];
v2 = [pivData.U(validV), pivData.V(validV)]; % Added validV by WIM on 4/7/2019
if j== firstFrame
cumulativeV_forV = zeros(size(pivData.U,1),2);
cumulativeV_forBeads = zeros(size(pivData.U,1),2);
cumulativeV_forV = zeros(size(pivData.U(validV),1),2); % Added validV by WIM on 4/7/2019
cumulativeV_forBeads = zeros(size(pivData.X(validV),1),2); % Added validV by WIM on 4/7/2019
else
cumulativeV_forV = cumulativeV_forV+v2;
v2(~validV,1)=0; v2(~validV,2)=0;
Expand All @@ -462,8 +463,11 @@ function calculateMovieDisplacementField(movieData,varargin)
currentBeads = [pivData.X(validV), pivData.Y(validV)] + cumulativeV_forBeads;
displField(j).pos=[pivData.X(validV), pivData.Y(validV)];
displField(j).vec=[cumulativeV_forV(validV,1)+residualT(j,2) cumulativeV_forV(validV,2)+residualT(j,1)]; % residual should be added with oppiste order! -SH 072514

prevImage=currImage; % added by WIM on 4/7/2019 to track frames successively.
end

%------------------------

% % testing additional pass of piv processing
% pivPar.iaSizeX=[ 8];
% pivPar.iaStepX=[ 4];
Expand Down Expand Up @@ -527,4 +531,4 @@ function calculateMovieDisplacementField(movieData,varargin)
% Close waitbar
if ishandle(wtBar), close(wtBar); end

disp('Finished calculating displacement field!')
disp('Finished calculating displacement field!')