fix wrong output for files with "ua*" that should be unwarp

Author: Remi-Gau

src/defaults/Mapping.m

@@ -175,12 +175,12 @@
                          { 'iy_' },                obj.cfg.segment.deformation_field.from_mni; ...
                          { 'y_' },                 obj.cfg.segment.deformation_field.to_mni; ...
                          { 'segparam_' },                     obj.cfg.segment.param; ...
-                         { obj.stc, [obj.unwarp, obj.stc]},   obj.cfg.stc; ...
+                         { obj.stc},   obj.cfg.stc; ...
                          { 'unwarpparam_' },                  obj.cfg.realign_unwarp_param; ...
-                         { obj.unwarp },                      obj.cfg.realign_unwarp; ...
+                         { obj.unwarp, [obj.unwarp, obj.stc] }, obj.cfg.realign_unwarp; ...
                          { 'rp_', ['rp_' obj.stc] },          obj.cfg.real_param; ...
                          { 'mean', ...
-                          ['mean' obj.unwarp], ...
+                          ['mean' obj.unwarp], ...      
                           ['mean' obj.unwarp, obj.stc] },     obj.cfg.mean; ...
                          { obj.norm, ...
                           [obj.norm, obj.bias_cor], ...

tests/test_spm_2_bids.m

@@ -18,11 +18,8 @@ function test_spm_2_bids_order_entities()
 
 function test_spm_2_bids_suffix()
 
-    input_output = {
-                    'sub-01_T1w_seg8.mat', ...
-                    'sub-01_label-T1w_segparam.mat'
-                    'sub-01_task-auditory_bold_uw.mat', ...
-                    'sub-01_task-auditory_label-bold_unwarpparam.mat'};
+    input_output = {'sub-01_T1w_seg8.mat', 'sub-01_label-T1w_segparam.mat'
+                    'sub-01_task-foo_bold_uw.mat', 'sub-01_task-foo_label-bold_unwarpparam.mat'};
 
     for i = 1:numel(size(input_output, 1))
 
@@ -230,7 +227,7 @@ function test_spm_2_bids_func()
     prefix_and_output = { ...
                          {'a'}, ...
                          'sub-01_task-auditory_space-individual_desc-stc_bold.nii'; ...
-                         {'u'},  ...
+                         {'u', 'ua'},  ...
                          'sub-01_task-auditory_space-individual_desc-realignUnwarp_bold.nii'; ...
                          {'rp_', 'rp_a'}, ...
                          'sub-01_task-auditory_motion.tsv'; ...