Skip to content

Commit

Permalink
Merge pull request nipy#1437 from BRAINSia/RemoveSimpleITK
Browse files Browse the repository at this point in the history
FIX: Removes unnecessary methods from smri freesurfer workflow utils.
  • Loading branch information
satra committed Apr 16, 2016
2 parents 6b0fbaa + c39acaf commit e99d34d
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 435 deletions.
5 changes: 1 addition & 4 deletions nipype/workflows/smri/freesurfer/autorecon1.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import sys
import os
import nipype
from nipype.interfaces.utility import Function,IdentityInterface
import nipype.pipeline.engine as pe # pypeline engine
from nipype.interfaces.freesurfer import *
from .utils import copy_file, copy_files
from .utils import copy_file


def checkT1s(T1_files, cw256=False):
Expand Down
2 changes: 0 additions & 2 deletions nipype/workflows/smri/freesurfer/autorecon2.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import os
import nipype
from nipype.interfaces.utility import Function, IdentityInterface, Merge
import nipype.pipeline.engine as pe # pypeline engine
from nipype.interfaces.freesurfer import *
Expand Down
5 changes: 1 addition & 4 deletions nipype/workflows/smri/freesurfer/autorecon3.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import os
import nipype
from nipype.interfaces.utility import Function, IdentityInterface, Merge
from nipype.interfaces.utility import IdentityInterface, Merge
import nipype.pipeline.engine as pe # pypeline engine
from nipype.interfaces.freesurfer import *
from .ba_maps import create_ba_maps_wf
from .utils import createsrcsubj
from nipype.interfaces.io import DataGrabber

def create_AutoRecon3(name="AutoRecon3", qcache=False, plugin_args=None,
Expand Down
41 changes: 0 additions & 41 deletions nipype/workflows/smri/freesurfer/recode_tables/fs2abc.csv

This file was deleted.

12 changes: 1 addition & 11 deletions nipype/workflows/smri/freesurfer/recon.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ def link_masks(subjects_dir, subject_id):
wf.connect(autorecon_resume, "subject_id", outputnode, "subject_id")
return wf

def create_reconall_workflow(name="ReconAll", plugin_args=None,
recoding_file=None):
def create_reconall_workflow(name="ReconAll", plugin_args=None):
"""Creates the ReconAll workflow in nipype.
Example
Expand Down Expand Up @@ -510,15 +509,6 @@ def completemethod(datasinked_files, subject_id):
(inputspec, completion, [('subject_id', 'subject_id')]),
(completion, postds_outputspec, [('subject_id', 'subject_id')])])


#### Workflow additions go here
if recoding_file:
from utils import create_recoding_wf
recode = create_recoding_wf(recoding_file)
reconall.connect([(ar3_wf, recode, [('outputspec.aseg', 'inputspec.labelmap')]),
(recode, outputspec, [('outputspec.recodedlabelmap', 'recoded_labelmap')])])


return reconall


Expand Down
Loading

0 comments on commit e99d34d

Please sign in to comment.