Commit 3d5f0c88 authored by Turnhout, M.C. van's avatar Turnhout, M.C. van
Browse files

fix results matrix for DMA_analyseevents (courtesy of Ayla)

parent f7b2c88c
......@@ -90,8 +90,7 @@ for d = 1:numel(dois)
y = oby(dois(d), dframe*numel(param.fluo));
r = sqrt(obA(dois(d), dframe*numel(param.fluo))/pi);
% check channels for matching cells
cellfound = 0;
% check channels for matching cells
checkcells;
% did we find 'em?
if cellfound > 0
......@@ -114,9 +113,10 @@ for d = 1:numel(dois)
end
end
% update dcel
dcel(1:param.nchan-1, 1) = dois(d);
dcel(1:param.nchan-1, 2:end) = dcr;
% update dcel: dcel = zeros(numel(dois)*numel(param.fluo), nframe+1);
dcel((param.nchan-1)*(d-1)+1:(param.nchan-1)*d, 1) = dois(d);
dcel((param.nchan-1)*(d-1)+1:(param.nchan-1)*d, 2:end) = dcr;
end
......@@ -133,6 +133,7 @@ fclose(fid);
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
function checkcells
cellfound = 0;
for ch = 1:param.nchan-2
% get coordinates
xc = obx(dois(d), ch + (dframe-1)*numel(param.fluo));
......
......@@ -408,7 +408,7 @@ labdef = DMA_labconfig; % Courtesy of Douglas
% and finally:
labdef.DMAlabUrl = 'https://gitlab.tue.nl/STEM/DMAlab';
labdef.DMAlabBranch = 'testing'; % Update to 'master' before merge!
labdef.DMAlabVersion = '0.03a2+'; % Update *before* merge!
labdef.DMAlabVersion = '0.03a2u1'; % Update *before* merge!
end
......
......@@ -279,35 +279,3 @@ POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
Part of spectralab, a collection of data on excitation and emission
spectra of fluorescent dyes, and matlab scripts to interact with that data.
Copyright (C) 2013 Mark van Turnhout, Eindhoven University of Technology,
Department of Biomedical Engineering, PO Box 513, GEM-Z 4.107,
5600 MB Eindhoven, The Netherlands, m@c@v@turnhout.tue@nl
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment