get the correct source metadata if smoothing prefix includes FWHM

Author: Remi-Gau

miss_hit.cfg

@@ -17,5 +17,5 @@ copyright_entity: "spm_2_bids developers"
 # metric for code quality
 metric "cnest": limit 5
 metric "file_length": limit 500
-metric "cyc": limit 16
+metric "cyc": limit 20
 metric "parameters": limit 6

src/spm_2_bids.m

@@ -155,7 +155,7 @@
     Sources = identify_sources(file, map, verbose);
     if ~isempty(Sources)
         content.Sources = Sources;
-    else
+    elseif isfield(content, 'Sources')
         content = rmfield(content, 'Sources');
     end
 

src/utils/identify_sources.m

@@ -102,7 +102,18 @@
         else
             % remove the prefix of the last step
 
-            if startsWith(bf.prefix, 's') || startsWith(bf.prefix, 'u')
+            if startsWith(bf.prefix, 's')
+
+                % in case the prefix includes a number to denotate the FXHM used
+                % for smoothing
+                starts_with_fwhm = regexp(bf.prefix, '^s[0-9]*', 'match');
+                if ~isempty(starts_with_fwhm)
+                    bf.prefix = bf.prefix(length(starts_with_fwhm{1}) + 1:end);
+                else
+                    bf.prefix = bf.prefix(2:end);
+                end
+
+            elseif startsWith(bf.prefix, 'u')
                 bf.prefix = bf.prefix(2:end);
 
             elseif startsWith(bf.prefix, 'w')

tests/test_spm_2_bids_metadata.m

@@ -8,6 +8,21 @@
     initTestSuite;
 end
 
+function test_spm_2_bids_metadata_smoothed_data()
+
+    file = 's6wusub-01_task-auditory_bold.nii';
+
+    [~, ~, json] = spm_2_bids(file, [], false);
+
+    assertEqual(fieldnames(json), {'filename'; 'content'});
+    assertEqual(json.content.RawSources{1}, 'sub-01/sub-01_task-auditory_bold.nii');
+    assertEqual(json.content.Sources{1}, ...
+                'sub-01/sub-01_task-auditory_space-IXI549Space_desc-preproc_bold.nii');
+
+    bids.util.jsonencode(json.filename, json.content);
+
+end
+
 function test_spm_2_bids_metadata_source_must_be_empty()
 
     file = 'msub-01_T1w.nii';