Skip to content

FIX: Return afni.Qwarp outputs as absolute paths #2705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions nipype/interfaces/afni/preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -3596,31 +3596,41 @@ def _list_outputs(self):
else:
ext = prefix[ext_ind:]
suffix = ''

# All outputs should be in the same directory as the prefix
out_dir = os.path.dirname(os.path.abspath(prefix))

outputs['warped_source'] = fname_presuffix(
prefix, suffix=suffix, use_ext=False) + ext
prefix, suffix=suffix, use_ext=False, newpath=out_dir) + ext
if not self.inputs.nowarp:
outputs['source_warp'] = fname_presuffix(
prefix, suffix='_WARP' + suffix, use_ext=False) + ext
prefix, suffix='_WARP' + suffix, use_ext=False,
newpath=out_dir) + ext
if self.inputs.iwarp:
outputs['base_warp'] = fname_presuffix(
prefix, suffix='_WARPINV' + suffix, use_ext=False) + ext
prefix, suffix='_WARPINV' + suffix, use_ext=False,
newpath=out_dir) + ext
if isdefined(self.inputs.out_weight_file):
outputs['weights'] = os.path.abspath(self.inputs.out_weight_file)

if self.inputs.plusminus:
outputs['warped_source'] = fname_presuffix(
prefix, suffix='_PLUS' + suffix, use_ext=False) + ext
prefix, suffix='_PLUS' + suffix, use_ext=False,
newpath=out_dir) + ext
outputs['warped_base'] = fname_presuffix(
prefix, suffix='_MINUS' + suffix, use_ext=False) + ext
prefix, suffix='_MINUS' + suffix, use_ext=False,
newpath=out_dir) + ext
outputs['source_warp'] = fname_presuffix(
prefix, suffix='_PLUS_WARP' + suffix, use_ext=False) + ext
prefix, suffix='_PLUS_WARP' + suffix, use_ext=False,
newpath=out_dir) + ext
outputs['base_warp'] = fname_presuffix(
prefix, suffix='_MINUS_WARP' + suffix, use_ext=False) + ext
prefix, suffix='_MINUS_WARP' + suffix, use_ext=False,
newpath=out_dir) + ext
return outputs

def _gen_filename(self, name):
if name == 'out_file':
return self._gen_fname(self.inputs.source_file, suffix='_QW')
return self._gen_fname(self.inputs.in_file, suffix='_QW')


class QwarpPlusMinusInputSpec(QwarpInputSpec):
Expand Down