AMD connectivity = autoi

christianbrodbeck · Sep 18, 2021 · 7a6e78b · 7a6e78b
1 parent a53c1ad
commit 7a6e78b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/eelbrain/_experiment/mne_experiment.py b/eelbrain/_experiment/mne_experiment.py
@@ -3146,7 +3146,7 @@ def load_fwd(
             else:
                 self.make_annot()
                 parc = self.get('parc')
-            fwd = load.fiff.forward_operator(fwd_file, src, self.get('mri-sdir'), parc)
+            fwd = load.fiff.forward_operator(fwd_file, src, self.get('mri-sdir'), parc, connectivity=False)
             if mask:
                 fwd = fwd.sub(source=np.invert(
                     fwd.source.parc.startswith('unknown')))

diff --git a/eelbrain/_io/fiff.py b/eelbrain/_io/fiff.py
@@ -1222,7 +1222,15 @@ def evoked_ndvar(evoked, name=None, data=None, exclude='bads', vmax=None,
     return NDVar(x, dims, name, info)
 
 
-def forward_operator(fwd, src, subjects_dir=None, parc='aparc', name=None):
+def forward_operator(
+        fwd,
+        src,
+        subjects_dir=None,
+        parc='aparc',
+        sysname: str = None,
+        connectivity: Union[str, Sequence] = None,
+        name=None,
+):
     """Load forward operator as :class:`NDVar`
 
     Parameters
@@ -1250,11 +1258,10 @@ def forward_operator(fwd, src, subjects_dir=None, parc='aparc', name=None):
         if name is None:
             name = os.path.basename(fwd)
         fwd = mne.read_forward_solution(fwd)
-        mne.convert_forward_solution(fwd, force_fixed=not is_vol, use_cps=True,
-                                     copy=False)
+        mne.convert_forward_solution(fwd, force_fixed=not is_vol, use_cps=True, copy=False)
     elif name is None:
         name = 'fwd'
-    sensor = sensor_dim(fwd['info'])
+    sensor = sensor_dim(fwd['info'], sysname=sysname, connectivity=connectivity)
     assert np.all(sensor.names == fwd['sol']['row_names'])
     subject = fwd['src'][0]['subject_his_id']
     if is_vol: