merging with Eftychios 3D

flatironinstitute · Dec 2, 2017 · 0626af9 · 0626af9
2 parents 65394c4 + 7be240f
commit 0626af9
Show file tree

Hide file tree

Showing 2 changed files with 477 additions and 881 deletions.
diff --git a/caiman/components_evaluation.py b/caiman/components_evaluation.py
@@ -395,8 +395,8 @@ def evaluate_components_placeholder(params):
     import numpy as np
     fname, traces, A, C, b, f, final_frate, remove_baseline, N, robust_std, Athresh, Npeaks, thresh_C = params
     Yr, dims, T = cm.load_memmap(fname)
-    d1, d2 = dims
-    images = np.reshape(Yr.T, [T] + list(dims), order='F')
+    #d1, d2 = dims
+    #images = np.reshape(Yr.T, [T] + list(dims), order='F')
     Y = np.reshape(Yr, dims + (T,), order='F')
     fitness_raw, fitness_delta, erfc_raw, erfc_delta, r_values, significant_samples = \
         evaluate_components(Y, traces, A, C, b, f, final_frate, remove_baseline=remove_baseline,