utils: update get_mapper call sites for maptype= rename (from PR 12 / 2a3c944c)

PR 6 renames get_mapper's `type` parameter to `maptype` (mypy Wave 3,
2a3c944c: `type` shadowed the builtin `type` used on the very next line).
cortex/utils.py has four call sites still using the old `type=` keyword;
since get_mapper has **kwargs, this wasn't a clean TypeError — the old
keyword silently landed in **kwargs, get_mapper defaulted `maptype` to
"nearest" regardless of what was requested, and the leftover kwarg then
propagated down to the sampler functions where PR 6 also added a "raise
ValueError on unexpected kwargs" check, surfacing as a confusing
ValueError several frames removed from the actual cause (or, worse, no
error at all and silently the wrong mapper class if a cache file for
"nearest" already happened to exist).

Reproduced before this commit:
  get_mapper('S1', 'fullhead', type='trilinear', recache=True)
  -> ValueError: nearest sampler does not take any kwargs

This isn't otherwise in PR 6 or PR 7's file list (cortex/utils.py belongs
to PR 12), but is picked from PR 12's 2a3c944c here — just the four
`type=` -> `maptype=` call-site renames in get_cortical_mask,
get_hemi_masks, get_roi_mask, and get_roi_masks — so that PR 6+7 doesn't
leave get_mapper's real callers broken. PR 12 will still add full typing
to cortex/utils.py; this commit only touches the four call sites that
would otherwise regress.

Verified: get_cortical_mask, get_hemi_masks, and get_roi_masks all run
correctly against the S1 test subject after this fix; all 4 previously
failed or behaved incorrectly before it (get_mapper('S1', 'fullhead',
type='trilinear', recache=True) reproduces the bug directly).

Author: kroq-gar78

cortex/utils.py

@@ -337,7 +337,7 @@ def get_cortical_mask(subject, xfmname, type='nearest'):
         dist, idx = get_vox_dist(subject, xfmname)
         return dist < dict(thick=8, thin=2)[type]
     else:
-        return get_mapper(subject, xfmname, type=type).mask
+        return get_mapper(subject, xfmname, maptype=type).mask
 
 
 def get_vox_dist(subject, xfmname, surface="fiducial", max_dist=np.inf):
@@ -395,7 +395,7 @@ def get_hemi_masks(subject, xfmname, type='nearest'):
     -------
 
     '''
-    return get_mapper(subject, xfmname, type=type).hemimasks
+    return get_mapper(subject, xfmname, maptype=type).hemimasks
 
 def add_roi(data, name="new_roi", open_inkscape=True, add_path=True,
             overlay_file=None, **kwargs):
@@ -590,7 +590,7 @@ def get_roi_mask(subject, xfmname, roi=None, projection='nearest'):
     """
     warnings.warn('Deprecated! Use get_roi_masks')
 
-    mapper = get_mapper(subject, xfmname, type=projection)
+    mapper = get_mapper(subject, xfmname, maptype=projection)
     rois = get_roi_verts(subject, roi=roi, mask=True)
     output = dict()
     for name, verts in list(rois.items()):
@@ -790,7 +790,7 @@ def get_roi_masks(subject, xfmname, roi_list=None, gm_sampler='cortical', split_
     if (use_cortex_mask or split_lr) or (not return_dict):
         vox_dst, vox_idx = get_vox_dist(subject, xfmname)
     if use_mapper:
-        mapper = get_mapper(subject, xfmname, type=mapper_dict[gm_sampler])
+        mapper = get_mapper(subject, xfmname, maptype=mapper_dict[gm_sampler])
     elif use_cortex_mask:
         if isinstance(gm_sampler, str):
             cortex_mask = db.get_mask(subject, xfmname, type=gm_sampler)