Skip to content

Commit f5c1be6

Browse files
committed
Minor fixes
* Added pipeline to __init__.py so its loadable the same way the others are * Polished code in pipeline creation
1 parent 449d6dc commit f5c1be6

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

nipype/workflows/dmri/fsl/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from dti import create_bedpostx_pipeline, create_eddy_correct_pipeline
1+
from dti import create_bedpostx_pipeline, create_eddy_correct_pipeline, create_epi_correct_pipeline
22
from tbss import (create_tbss_1_preproc, create_tbss_2_reg,
33
create_tbss_3_postreg, create_tbss_4_prestats,
4-
create_tbss_all, create_tbss_non_FA)
4+
create_tbss_all, create_tbss_non_FA)

nipype/workflows/dmri/fsl/dti.py

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def create_epi_correct_pipeline(name="epi_correct", register_to_ref=False ):
319319
,(mask_mag_dil, prelude, [('out_file', 'mask_file' ) ])
320320
,(prelude, fill_phase, [('unwrapped_phase_file','in_file')] )
321321
,(inputnode, vsm, [('fieldmap_mag', 'in_file')])
322-
,(fill_phase, vsm, [('out_file','phasemap_file')]) #, (('out_file',_genvsmpath),'shift_out_file') ] )
322+
,(fill_phase, vsm, [('out_file','phasemap_file')])
323323
,(inputnode, vsm, [(('te_diff',_ms2sec),'asym_se_time'),('vsm_sigma','smooth2d')])
324324
,(dwell_time, vsm, [(('dwell_time',_ms2sec),'dwell_time') ])
325325
,(mask_mag_dil, vsm, [('out_file','mask_file')] )
@@ -444,27 +444,9 @@ def _vsm_remove_mean( in_file, mask_file, in_unwarped ):
444444
nib.save( img, out_file )
445445
return out_file
446446

447-
#def _generate_fwdmap( in_file, mask_file, shift_in_file, in_unwarped):
448-
# import os
449-
# out_file = os.path.abspath( './fwdmap.nii.gz' )
450-
# cmd = 'fugue -i %s -w %s --loadshift=%s --mask=%s' % ( in_file, out_file, shift_in_file, mask_file )
451-
# print " Running:",cmd
452-
# os.system(cmd)
453-
# return out_file
454-
455-
def _genvsmpath( in_file ):
456-
import os
457-
name,fext = os.path.splitext( os.path.basename(in_file) )
458-
if fext == '.gz': name,_ = os.path.splitext(name)
459-
out_file = os.path.abspath( os.path.join( os.path.dirname(in_file), '%s_vsm.nii.gz' % name ))
460-
return out_file
461-
462447
def _ms2sec( val ):
463448
return val*1e-3;
464449

465-
def _yield( in_file, in_block ):
466-
return in_file
467-
468450
def _split_dwi( in_file ):
469451
import nibabel as nib
470452
import os

0 commit comments

Comments
 (0)