Skip to content

Commit edf7fef

Browse files
effigieseffigies
committed
FIX: Masks should be plural in latest ANTs version
1 parent c24992b commit edf7fef

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎niworkflows/interfaces/mni.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -209,18 +209,18 @@ def _get_ants_args(self):
209209
|-------------|------------------|-------------|-------------------------------------------
210210
| True | True | True | Update `moving_image` after applying
211211
| | | | mask.
212-
| | | | Set `moving_image_mask` applying
212+
| | | | Set `moving_image_masks` applying
213213
| | | | `create_cfm` with `global_mask=True`.
214214
|-------------|------------------|-------------|-------------------------------------------
215215
| True | True | False | Update `moving_image` after applying
216216
| | | | mask.
217217
|-------------|------------------|-------------|-------------------------------------------
218-
| True | False | True | Set `moving_image_mask` applying
218+
| True | False | True | Set `moving_image_masks` applying
219219
| | | | `create_cfm` with `global_mask=False`
220220
|-------------|------------------|-------------|-------------------------------------------
221-
| True | False | False | args['moving_image_mask'] = moving_mask
221+
| True | False | False | args['moving_image_masks'] = moving_mask
222222
|-------------|------------------|-------------|-------------------------------------------
223-
| False | * | True | Set `moving_image_mask` applying
223+
| False | * | True | Set `moving_image_masks` applying
224224
| | | | `create_cfm` with `global_mask=True`
225225
|-------------|------------------|-------------|-------------------------------------------
226226
| False | * | False | No action
@@ -240,15 +240,15 @@ def _get_ants_args(self):
240240
else:
241241
# Use the moving mask during registration.
242242
# Do not mask the moving image.
243-
args['moving_image_mask'] = self.inputs.moving_mask
243+
args['moving_image_masks'] = self.inputs.moving_mask
244244

245245
# If a lesion mask is also provided...
246246
if isdefined(self.inputs.lesion_mask):
247247
# Create a cost function mask with the form:
248248
# [global mask - lesion mask] (if explicit masking is enabled)
249249
# [moving mask - lesion mask] (if explicit masking is disabled)
250250
# Use this as the moving mask.
251-
args['moving_image_mask'] = create_cfm(
251+
args['moving_image_masks'] = create_cfm(
252252
self.inputs.moving_mask,
253253
lesion_mask=self.inputs.lesion_mask,
254254
global_mask=self.inputs.explicit_masking)
@@ -258,7 +258,7 @@ def _get_ants_args(self):
258258
elif isdefined(self.inputs.lesion_mask):
259259
# Create a cost function mask with the form: [global mask - lesion mask]
260260
# Use this as the moving mask.
261-
args['moving_image_mask'] = create_cfm(
261+
args['moving_image_masks'] = create_cfm(
262262
self.inputs.moving_image,
263263
lesion_mask=self.inputs.lesion_mask,
264264
global_mask=True)
@@ -275,18 +275,18 @@ def _get_ants_args(self):
275275
|----------------|------------------|-------------|----------------------------------------
276276
| True | True | True | Update `fixed_image` after applying
277277
| | | | mask.
278-
| | | | Set `fixed_image_mask` applying
278+
| | | | Set `fixed_image_masks` applying
279279
| | | | `create_cfm` with `global_mask=True`.
280280
|----------------|------------------|-------------|----------------------------------------
281281
| True | True | False | Update `fixed_image` after applying
282282
| | | | mask.
283283
|----------------|------------------|-------------|----------------------------------------
284-
| True | False | True | Set `fixed_image_mask` applying
284+
| True | False | True | Set `fixed_image_masks` applying
285285
| | | | `create_cfm` with `global_mask=False`
286286
|----------------|------------------|-------------|----------------------------------------
287-
| True | False | False | args['fixed_image_mask'] = fixed_mask
287+
| True | False | False | args['fixed_image_masks'] = fixed_mask
288288
|----------------|------------------|-------------|----------------------------------------
289-
| False | * | True | Set `fixed_image_mask` applying
289+
| False | * | True | Set `fixed_image_masks` applying
290290
| | | | `create_cfm` with `global_mask=True`
291291
|----------------|------------------|-------------|----------------------------------------
292292
| False | * | False | No action
@@ -311,7 +311,7 @@ def _get_ants_args(self):
311311
if isdefined(self.inputs.lesion_mask):
312312
# Create a cost function mask with the form: [global mask]
313313
# Use this as the fixed mask.
314-
args['fixed_image_mask'] = create_cfm(
314+
args['fixed_image_masks'] = create_cfm(
315315
self.inputs.reference_mask,
316316
lesion_mask=None,
317317
global_mask=True)
@@ -321,14 +321,14 @@ def _get_ants_args(self):
321321
else:
322322
# Use the reference mask as the fixed mask during registration.
323323
# Do not mask the fixed image.
324-
args['fixed_image_mask'] = self.inputs.reference_mask
324+
args['fixed_image_masks'] = self.inputs.reference_mask
325325

326326
# If no reference mask is provided...
327327
# But a lesion mask *IS* provided ...
328328
elif isdefined(self.inputs.lesion_mask):
329329
# Create a cost function mask with the form: [global mask]
330330
# Use this as the fixed mask
331-
args['fixed_image_mask'] = create_cfm(
331+
args['fixed_image_masks'] = create_cfm(
332332
self.inputs.reference_image,
333333
lesion_mask=None,
334334
global_mask=True)
@@ -358,7 +358,7 @@ def _get_ants_args(self):
358358
if isdefined(self.inputs.lesion_mask):
359359
# Create a cost function mask with the form: [global mask]
360360
# Use this as the fixed mask.
361-
args['fixed_image_mask'] = create_cfm(
361+
args['fixed_image_masks'] = create_cfm(
362362
_template_fmt % (resolution, 'brainmask'),
363363
lesion_mask=None,
364364
global_mask=True)
@@ -368,7 +368,7 @@ def _get_ants_args(self):
368368
# Use the raw template as the fixed image.
369369
args['fixed_image'] = _template_fmt % (resolution, self.inputs.reference)
370370
# Use the template mask as the fixed mask.
371-
args['fixed_image_mask'] = _template_fmt % (resolution, 'brainmask')
371+
args['fixed_image_masks'] = _template_fmt % (resolution, 'brainmask')
372372

373373
return args
374374

0 commit comments

Comments
 (0)