Merge remote-tracking branch 'upstream/master' into cifti-combos

niworkflows/utils/spaces.py

@@ -42,6 +42,8 @@
 ]
 """List of supported nonstandard reference spaces."""
 
+NONSTANDARD_2D_REFERENCES = ["fsnative"]
+"""List of supported nonstandard 2D reference spaces."""
 
 FSAVERAGE_DENSITY = {
     "fsaverage3": "642",
@@ -117,6 +119,16 @@ class Reference:
     >>> Reference('MNIPediatricAsym', {'cohort': 1}).standard
     True
 
+    >>> # Check dim property
+    >>> Reference('func').dim
+    3
+    >>> Reference('MNI152NLin6Asym').dim
+    3
+    >>> Reference('fsnative').dim
+    2
+    >>> Reference('onavg').dim
+    2
+
     >>> # Equality/inequality checks
     >>> Reference('func') == Reference('func')
     True
@@ -138,6 +150,7 @@ class Reference:
     """
 
     _standard_spaces = tuple(_tfapi.templates())
+    _spaces_2d = tuple(_tfapi.templates(suffix="sphere"))
 
     space = attr.ib(default=None, type=str)
     """Name designating this space."""
@@ -167,8 +180,7 @@ def __attrs_post_init__(self):
                 spec["den"] = FSAVERAGE_DENSITY[space]
                 object.__setattr__(self, "spec", spec)
 
-        # XXX: This won't cover dhcpAsym, dhcpSym, or onavg
-        if self.space.startswith("fs"):
+        if (self.space in self._spaces_2d) or (self.space in NONSTANDARD_2D_REFERENCES):
             object.__setattr__(self, "dim", 2)
 
         if self.space in self._standard_spaces: