diff --git a/@Sources2D/Sources2D.m b/@Sources2D/Sources2D.m index 207aaac..e59305c 100644 --- a/@Sources2D/Sources2D.m +++ b/@Sources2D/Sources2D.m @@ -54,7 +54,13 @@ function updateSpatial(obj, Y) Y, obj.A, obj.b, obj.C, obj.f, obj.P, obj.options); end - %% merge the found components + %% update temporal components in parallel + function Y_res = updateTemporalParallel(obj, Y) + [obj.C, obj.f, Y_res, obj.P, obj.S] = update_temporal_components_parallel(... + Y, obj.A, obj.b, obj.C, obj.f, obj.P, obj.options); + end + + %% merge found components function [nr, merged_ROIs] = merge(obj, Y_res) [obj.A, obj.C, nr, merged_ROIs, obj.P, obj.S] = merge_components(... Y_res,obj.A, obj.b, obj.C, obj.f, obj.P,obj.S, obj.options); diff --git a/constrained_foopsi.m b/constrained_foopsi.m index 43a411f..ccf5437 100644 --- a/constrained_foopsi.m +++ b/constrained_foopsi.m @@ -1,5 +1,5 @@ function [c,b,c1,g,sn,sp] = constrained_foopsi(y,b,c1,g,sn,options) -% spike inference using a constrained foopsi approach: +% spike inference using a constrained deconvolution approach: % min sum(sp) % c,sp,b,c1 % subject to: sp >= 0 diff --git a/demo_script.m b/demo_script.m index 10cd730..6bd9edd 100644 --- a/demo_script.m +++ b/demo_script.m @@ -1,7 +1,6 @@ clear; %% load file -addpath(genpath('../constrained-foopsi')); addpath(genpath('utilities')); nam = 'demoMovie.tif'; % insert path to tiff stack here diff --git a/demo_script_class.m b/demo_script_class.m index 86a0219..4bd5d65 100644 --- a/demo_script_class.m +++ b/demo_script_class.m @@ -2,7 +2,6 @@ % same demo as demo_script.m but using the clas @Sources2D %% load file -addpath(genpath('../constrained-foopsi')); addpath(genpath('utilities')); nam = 'demoMovie.tif'; % insert path to tiff stack here diff --git a/documentation.pdf b/documentation.pdf index 7f5c5c3..6a10985 100644 Binary files a/documentation.pdf and b/documentation.pdf differ diff --git a/utilities/initialize_components.m b/initialize_components.m similarity index 100% rename from utilities/initialize_components.m rename to initialize_components.m diff --git a/utilities/preprocess_data.m b/preprocess_data.m similarity index 100% rename from utilities/preprocess_data.m rename to preprocess_data.m