Skip to content
Snippets Groups Projects
Commit 1e69f7b8 authored by ac 20's avatar ac 20
Browse files

turned off patch in process movie

parent cd6ca39f
Branches
No related tags found
No related merge requests found
...@@ -74,9 +74,14 @@ for idp=0:ceil(size(commandList,1)/p.NumWorkers)-1 ...@@ -74,9 +74,14 @@ for idp=0:ceil(size(commandList,1)/p.NumWorkers)-1
elseif length(tTarget>1) elseif length(tTarget>1)
cmd=['select time from tblCells where time>=' num2str(tTarget(1))... cmd=['select time from tblCells where time>=' num2str(tTarget(1))...
' and time<=' num2str(tTarget(end)) ' and channel=' num2str(segParams.channels) ' group by time']; ' and time<=' num2str(tTarget(end)) ' and channel=' num2str(segParams.channels) ' group by time'];
else
cmd=[];
tSeg=[];
end end
if ~isempty(cmd)
q=ljsFetch(conn,cmd); q=ljsFetch(conn,cmd);
tSeg=cell2mat(q); tSeg=cell2mat(q);
end
spmd spmd
t=commandList(labindex+idxCommandList,1); t=commandList(labindex+idxCommandList,1);
......
...@@ -11,11 +11,11 @@ tProcess.tTrack1=toc(tx); ...@@ -11,11 +11,11 @@ tProcess.tTrack1=toc(tx);
[conn,CONSTANTS]=openDB(strDB); [conn,CONSTANTS]=openDB(strDB);
tx=tic(); tx=tic();
Smooth.Patch.patch(conn,CONSTANTS); % Smooth.Patch.patch(conn,CONSTANTS);
tProcess.tPatch=toc(tx); tProcess.tPatch=toc(tx);
tx=tic(); tx=tic();
Batch.batchTrack(strDB); % Batch.batchTrack(strDB);
tProcess.tTrack2=toc(tx); tProcess.tTrack2=toc(tx);
tx=tic(); tx=tic();
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
% replication % replication
function [mergedCell,percentOverlap]=ensembleCheckMerge(conn,cellIDs,CONSTANTS) function [mergedCell,percentOverlap]=ensembleCheckMerge(conn,cellIDs,CONSTANTS)
mergedCell=[];
percentOverlap=0;
if length(cellIDs)<=1 if length(cellIDs)<=1
return return
end end
...@@ -27,6 +30,10 @@ end ...@@ -27,6 +30,10 @@ end
cxMerge=[]; cxMerge=[];
for i=1:length(cellIDs) for i=1:length(cellIDs)
nc=Read.getCell(conn,cellIDs(i)); nc=Read.getCell(conn,cellIDs(i));
if isempty(nc)
% merge failed
return;
end
cxMerge=[cxMerge,nc]; cxMerge=[cxMerge,nc];
end end
cxMerge=Read.setCellsIdxPts(cxMerge,CONSTANTS); cxMerge=Read.setCellsIdxPts(cxMerge,CONSTANTS);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment