Skip to content

Commit b344a58

Browse files
committed
Fixed BET's returned output path bug, resolves #2916.
1 parent 5f85656 commit b344a58

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

nipype/interfaces/fsl/preprocess.py

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,45 +173,50 @@ def _gen_outfilename(self):
173173
def _list_outputs(self):
174174
outputs = self.output_spec().get()
175175
outputs["out_file"] = self._gen_outfilename()
176+
177+
basename = os.path.basename(outputs['out_file'])
178+
cwd = os.path.dirname(outputs['out_file'])
179+
kwargs = {'basename': basename, 'cwd': cwd}
180+
176181
if (isdefined(self.inputs.mesh) and self.inputs.mesh) or (
177182
isdefined(self.inputs.surfaces) and self.inputs.surfaces
178183
):
179184
outputs["meshfile"] = self._gen_fname(
180-
outputs["out_file"], suffix="_mesh.vtk", change_ext=False
185+
suffix="_mesh.vtk", change_ext=False, **kwargs
181186
)
182187
if (isdefined(self.inputs.mask) and self.inputs.mask) or (
183188
isdefined(self.inputs.reduce_bias) and self.inputs.reduce_bias
184189
):
185-
outputs["mask_file"] = self._gen_fname(outputs["out_file"], suffix="_mask")
190+
outputs["mask_file"] = self._gen_fname(suffix="_mask", **kwargs)
186191
if isdefined(self.inputs.outline) and self.inputs.outline:
187192
outputs["outline_file"] = self._gen_fname(
188-
outputs["out_file"], suffix="_overlay"
193+
suffix="_overlay", **kwargs
189194
)
190195
if isdefined(self.inputs.surfaces) and self.inputs.surfaces:
191196
outputs["inskull_mask_file"] = self._gen_fname(
192-
outputs["out_file"], suffix="_inskull_mask"
197+
suffix="_inskull_mask", **kwargs
193198
)
194199
outputs["inskull_mesh_file"] = self._gen_fname(
195-
outputs["out_file"], suffix="_inskull_mesh"
200+
suffix="_inskull_mesh", **kwargs
196201
)
197202
outputs["outskull_mask_file"] = self._gen_fname(
198-
outputs["out_file"], suffix="_outskull_mask"
203+
suffix="_outskull_mask", **kwargs
199204
)
200205
outputs["outskull_mesh_file"] = self._gen_fname(
201-
outputs["out_file"], suffix="_outskull_mesh"
206+
suffix="_outskull_mesh", **kwargs
202207
)
203208
outputs["outskin_mask_file"] = self._gen_fname(
204-
outputs["out_file"], suffix="_outskin_mask"
209+
suffix="_outskin_mask", **kwargs
205210
)
206211
outputs["outskin_mesh_file"] = self._gen_fname(
207-
outputs["out_file"], suffix="_outskin_mesh"
212+
suffix="_outskin_mesh", **kwargs
208213
)
209214
outputs["skull_mask_file"] = self._gen_fname(
210-
outputs["out_file"], suffix="_skull_mask"
215+
suffix="_skull_mask", **kwargs
211216
)
212217
if isdefined(self.inputs.skull) and self.inputs.skull:
213218
outputs["skull_file"] = self._gen_fname(
214-
outputs["out_file"], suffix="_skull"
219+
suffix="_skull", **kwargs
215220
)
216221
if isdefined(self.inputs.no_output) and self.inputs.no_output:
217222
outputs["out_file"] = Undefined

0 commit comments

Comments
 (0)