Skip to content

Commit adb9988

Browse files
committed
Split over-eager globs in FreeSurferSource
1 parent 15f520d commit adb9988

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

nipype/interfaces/io.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,12 +1511,21 @@ class FSSourceOutputSpec(TraitedSpec):
15111511
loc='mri')
15121512
curv = OutputMultiPath(File(exists=True), desc='Maps of surface curvature',
15131513
loc='surf')
1514+
avg_curv = OutputMultiPath(
1515+
File(exists=True), desc='Average atlas curvature, sampled to subject',
1516+
loc='surf')
15141517
inflated = OutputMultiPath(
15151518
File(exists=True), desc='Inflated surface meshes',
15161519
loc='surf')
15171520
pial = OutputMultiPath(
1518-
File(exists=True), desc='Gray matter/pia mater surface meshes',
1521+
File(exists=True), desc='Gray matter/pia matter surface meshes',
15191522
loc='surf')
1523+
area_pial = OutputMultiPath(
1524+
File(exists=True), desc='Gray matter/pia matter surface meshes',
1525+
loc='surf', altkey='area.pial')
1526+
curv_pial = OutputMultiPath(
1527+
File(exists=True), desc='Gray matter/pia matter surface meshes',
1528+
loc='surf', altkey='curv.pial')
15201529
smoothwm = OutputMultiPath(File(exists=True), loc='surf',
15211530
desc='Smoothed original surface meshes')
15221531
sphere = OutputMultiPath(
@@ -1531,6 +1540,10 @@ class FSSourceOutputSpec(TraitedSpec):
15311540
white = OutputMultiPath(
15321541
File(exists=True), desc='White/gray matter surface meshes',
15331542
loc='surf')
1543+
jacobian_white = OutputMultiPath(
1544+
File(exists=True),
1545+
desc='Distortion required to register to spherical atlas',
1546+
loc='surf')
15341547
label = OutputMultiPath(
15351548
File(exists=True), desc='Volume and surface label files',
15361549
loc='label', altkey='*label')
@@ -1590,12 +1603,17 @@ def _get_files(self, path, key, dirval, altkey=None):
15901603
elif dirval == 'stats':
15911604
globsuffix = '.stats'
15921605
globprefix = ''
1593-
if key == 'ribbon' or dirval in ['surf', 'label', 'stats']:
1606+
if dirval in ('surf', 'label', 'stats'):
1607+
if self.inputs.hemi != 'both':
1608+
globprefix = self.inputs.hemi + '.'
1609+
else:
1610+
globprefix = '?h.'
1611+
elif key == 'ribbon':
15941612
if self.inputs.hemi != 'both':
15951613
globprefix = self.inputs.hemi + '.'
15961614
else:
15971615
globprefix = '*'
1598-
if key == 'aseg_stats' or key == 'wmparc_stats':
1616+
elif key in ('aseg_stats', 'wmparc_stats'):
15991617
globprefix = ''
16001618
keydir = os.path.join(path, dirval)
16011619
if altkey:

0 commit comments

Comments
 (0)