deal with special prefixes in identify sources

Author: Remi-Gau

src/Mapping.m

@@ -317,6 +317,8 @@ function print_mapping(obj, filename)
                                  [obj.smooth, obj.norm, obj.unwarp], ...
                                  [obj.smooth, obj.norm, obj.realign] },        obj.cfg.smooth_norm};
 
+            spec_preproc = {{[obj.realign, obj.stc]},                obj.cfg.preproc};
+
             spec_preproc_norm = {{obj.norm, ...
                                   [obj.norm, obj.bias_cor], ...
                                   [obj.norm, obj.stc,     obj.unwarp], ...
@@ -329,6 +331,7 @@ function print_mapping(obj, filename)
                        spec_smooth, ...
                        spec_smooth_norm, ...
                        spec_preproc_norm, ...
+                       spec_preproc, ...
                        spec_mean, ...
                        spec_norm_mean);
 

src/utils/identify_sources.m

@@ -102,15 +102,31 @@
         else
             % remove the prefix of the last step
 
-            if bids.internal.starts_with(bf.prefix, 's') || ...
-                bids.internal.starts_with(bf.prefix, 'u')
+            if bids.internal.starts_with(bf.prefix, 's') && ...
+                ~bids.internal.starts_with(bf.prefix, 'std_') && ...
+                 ~bids.internal.starts_with(bf.prefix, 'segparam_')
+
+                % in case we have "s6" for the fwhm
+                if isnan(str2double(bf.prefix(2)))
+                    bf.prefix = bf.prefix(2:end);
+                else
+                    bf.prefix = bf.prefix(3:end);
+                end
+
+            elseif bids.internal.starts_with(bf.prefix, 'u') && ...
+                   ~bids.internal.starts_with(bf.prefix, 'unwarpparam_')
+
                 bf.prefix = bf.prefix(2:end);
 
+                add_deformation_field = true;
+
             elseif bids.internal.starts_with(bf.prefix, 'w')
+
                 bf.prefix = bf.prefix(2:end);
                 add_deformation_field = true;
 
             elseif bids.internal.starts_with(bf.prefix, 'rp_a')
+
                 bf.prefix = bf.prefix(4:end);
 
             elseif bids.internal.starts_with(bf.prefix, 'mean')

tests/test_spm_2_bids.m

@@ -239,6 +239,8 @@ function test_spm_2_bids_func()
                          'sub-01_task-auditory_motion.tsv'; ...
                          {'mean', 'meanu', 'meanua', 'meanau'}, ...
                          'sub-01_task-auditory_space-individual_desc-mean_bold.nii'; ...
+                         {'ra'}, ...
+                         'sub-01_task-auditory_space-individual_desc-preproc_bold.nii'; ...
                          {'w', 'wua', 'wu', 'wr', 'wra'}, ...
                          'sub-01_task-auditory_space-IXI549Space_desc-preproc_bold.nii'; ...
                          {'wmean', 'wmeanu', 'wmeanua', 'wmeanau'}, ...