Merge pull request #862 from flatironinstitute/dev_fix_tuples

Fix tuples
flatironinstitute · Apr 5, 2021 · eab8e20 · eab8e20
2 parents e2b191d + 788992b
commit eab8e20
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 10,845 deletions.
diff --git a/caiman/motion_correction.py b/caiman/motion_correction.py
@@ -179,12 +179,15 @@ def __init__(self, fname, min_mov=None, dview=None, max_shifts=(6, 6), niter_rig
         """
         if 'ndarray' in str(type(fname)):
             logging.info('Creating file for motion correction "tmp_mov_mot_corr.hdf5"')
-            cm.movie(fname).save('./tmp_mov_mot_corr.hdf5')
+            cm.movie(fname).save('./tmp_mov_mot_corr.hdf5') # FIXME don't write to the current directory!
             fname = ['./tmp_mov_mot_corr.hdf5']
 
         if type(fname) is not list:
             fname = [fname]
 
+        if type(gSig_filt) is tuple:
+            gSig_filt = list(gSig_filt) # There are some serializers down the line that choke otherwise
+
         self.fname = fname
         self.dview = dview
         self.max_shifts = max_shifts

diff --git a/demos/obsolete/1_1/demo_OnACID_1_1.py b/demos/obsolete/1_1/demo_OnACID_1_1.py