Merge pull request #1353 from proektlab/none-load-fix

Fix medw loading as b'NoneType' instead of None

caiman/utils/utils.py

@@ -561,25 +561,16 @@ def recursively_load_dict_contents_from_group(h5file:h5py.File, path:str) -> dic
 
     for key, item in h5file[path].items():
         if isinstance(item, h5py._hl.dataset.Dataset):
-            val_set = np.nan
-            if isinstance(item[()], str):
-                if item[()] == 'NoneType':
-                    ans[key] = None
-                else:
-                    ans[key] = item[()]
-
-            elif key in ['dims', 'medw', 'sigma_smooth_snmf', 'dxy', 'max_shifts', 'strides', 'overlaps']:
-                if isinstance(item[()], np.ndarray):
-                    ans[key] = tuple(item[()])
-                else:
-                    ans[key] = item[()]
+            val = item[()]
+            if isinstance(val, str) and val == 'NoneType' or isinstance(val, bytes) and val == b'NoneType':
+                ans[key] = None
+            elif key in ['dims', 'medw', 'sigma_smooth_snmf',
+                         'dxy', 'max_shifts', 'strides', 'overlaps'] and isinstance(val, np.ndarray):
+                    ans[key] = tuple(val)
+            elif isinstance(val, np.bool_): # sigh
+                ans[key] = bool(val)
             else:
-                if isinstance(item[()], np.bool_): # sigh
-                    ans[key] = bool(item[()])
-                else:
-                    ans[key] = item[()]
-                    if isinstance(ans[key], bytes) and ans[key] == b'NoneType':
-                        ans[key] = None
+                ans[key] = item[()]
 
         elif isinstance(item, h5py._hl.group.Group):
             if key in ('A', 'W', 'Ab', 'downscale_matrix', 'upscale_matrix'):