Skip to content

Commit b372a14

Browse files
committed
address @chrisfilo's comments
1 parent d7dc606 commit b372a14

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

nipype/interfaces/ants/registration.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,6 @@ class RegistrationInputSpec(ANTSCommandInputSpec):
400400
low=0.0, high=1.0, value=0.0, argstr='%s', usedefault=True, desc="The Lower quantile to clip image ranges")
401401

402402
verbose = traits.Bool(argstr='-v', default=False)
403-
profiling = traits.Bool(False, usedefault=True,
404-
desc='generate profiling output fields')
405403

406404

407405
class RegistrationOutputSpec(TraitedSpec):
@@ -693,15 +691,16 @@ class Registration(ANTSCommand):
693691

694692
def __init__(self, **inputs):
695693
super(Registration, self).__init__(**inputs)
696-
self._elapsed_time = 0.0
697-
self._metric_value = 0.0
694+
self._elapsed_time = None
695+
self._metric_value = None
698696

699697
def _run_interface(self, runtime, correct_return_codes=(0,)):
700698
runtime = super(Registration, self)._run_interface(runtime)
701699

702700
# Parse some profiling info
703-
if self.inputs.profiling:
704-
lines = runtime.stdout.split('\n')
701+
output = runtime.stdout or runtime.merged
702+
if output:
703+
lines = output.split('\n')
705704
for l in lines[::-1]:
706705
# This should be the last line
707706
if l.strip().startswith('Total elapsed time:'):
@@ -1063,8 +1062,9 @@ def _list_outputs(self):
10631062
outputs['inverse_warped_image'] = os.path.abspath(inv_out_filename)
10641063
if len(self.inputs.save_state):
10651064
outputs['save_state'] = os.path.abspath(self.inputs.save_state)
1066-
if self.inputs.profiling:
1065+
if self._metric_value:
10671066
outputs['metric_value'] = self._metric_value
1067+
if self._elapsed_time:
10681068
outputs['elapsed_time'] = self._elapsed_time
10691069
return outputs
10701070

nipype/interfaces/ants/tests/test_auto_Registration.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ def test_Registration_inputs():
8282
),
8383
output_warped_image=dict(hash_files=False,
8484
),
85-
profiling=dict(usedefault=True,
86-
),
8785
radius_bins_item_trait=dict(),
8886
radius_bins_stage_trait=dict(),
8987
radius_or_number_of_bins=dict(requires=['metric_weight'],

0 commit comments

Comments
 (0)