update createFilename

Author: Remi-Gau

createFilename.m

@@ -64,7 +64,7 @@
     subjectNb = cfg.subject.subjectNb;
     sessionNb = cfg.subject.sessionNb;
     modality = cfg.fileName.modality;
-    taskName = cfg.task.name;
+    taskName = cfg.fileName.task;
 
     if isempty(sessionNb)
         sessionNb = 1;
@@ -101,19 +101,19 @@
 
     % set values for the suffixes for the different fields in the BIDS name
     fields2Check = { ...
-        'ce', ...
-        'dir', ...  % For BIDS file naming: phase encoding direction of acquisition for fMRI
-        'rec', ...  % For BIDS file naming: reconstruction of fMRI images
+        'contrastEnhancement', ...
+        'phaseEncodingDirection', ...  % For BIDS file naming: phase encoding direction of acquisition for fMRI
+        'reconstruction', ...  % For BIDS file naming: reconstruction of fMRI images
         'echo', ... % For BIDS file naming: echo fMRI images
-        'acq'       % For BIDS file naming: acquisition of fMRI images
+        'acquisition'       % For BIDS file naming: acquisition of fMRI images
         };
 
     for iField = 1:numel(fields2Check)
-        if isempty (cfg.fileName.mri.(fields2Check{iField})) %#ok<*GFLD>
+        if isempty (cfg.mri.(fields2Check{iField})) %#ok<*GFLD>
             cfg.fileName.suffix.mri.(fields2Check{iField}) = ''; %#ok<*SFLD>
         else
             cfg.fileName.suffix.mri.(fields2Check{iField}) = ...
-                ['_' fields2Check{iField} '-' getfield(cfg.fileName.mri, fields2Check{iField})];
+                ['_' fields2Check{iField} '-' getfield(cfg.mri, fields2Check{iField})];
         end
     end
 
@@ -128,10 +128,10 @@
     pattern = cfg.fileName.pattern;
 
     runSuffix = cfg.fileName.suffix.run;
-    acqSuffix = cfg.fileName.suffix.mri.acq ;
-    ceSuffix = cfg.fileName.suffix.mri.ce ;
-    dirSuffix = cfg.fileName.suffix.mri.dir ;
-    recSuffix = cfg.fileName.suffix.mri.rec ;
+    acqSuffix = cfg.fileName.suffix.mri.acquisition ;
+    ceSuffix = cfg.fileName.suffix.mri.contrastEnhancement ;
+    dirSuffix = cfg.fileName.suffix.mri.phaseEncodingDirection ;
+    recSuffix = cfg.fileName.suffix.mri.reconstruction ;
     echoSuffix = cfg.fileName.suffix.mri.echo;
 
     thisDate = cfg.fileName.date;

tests/test_createFilename.m

@@ -9,7 +9,7 @@ function test_createFilename()
 
     cfg.subject.subjectNb = 1;
     cfg.subject.runNb = 1;
-    cfg.task.name = 'testtask';
+    cfg.task.name = 'test task';
     cfg.dir.output = outputDir;
 
     %%% run part
@@ -20,9 +20,9 @@ function test_createFilename()
     % test data
     behDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'beh');
     eyetrackerDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'eyetracker');
-    eventFilename = ['sub-001_ses-001_task-testtask_run-001_events_date-'...
+    eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
         cfg.fileName.date '.tsv'];
-    stimFilename =  ['sub-001_ses-001_task-testtask_run-001_stim_date-'...
+    stimFilename =  ['sub-001_ses-001_task-testTask_run-001_stim_date-'...
         cfg.fileName.date '.tsv'];
 
     % make sure the beh dir is created
@@ -50,7 +50,7 @@ function test_createFilename()
     cfg.subject.subjectNb = 2;
     cfg.subject.sessionNb = 2;
     cfg.subject.runNb = 2;
-    cfg.task.name = 'testtask';
+    cfg.task.name = 'testTask';
     cfg.dir.output = outputDir;
 
     cfg.eyeTracker.do = true;
@@ -63,10 +63,10 @@ function test_createFilename()
     % test data
     funcDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'func');
     eyetrackerDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'eyetracker');
-    baseFilename = 'sub-ctrl002_ses-002_task-testtask';
-    eventFilename = ['sub-ctrl002_ses-002_task-testtask_run-002_events_date-' ...
+    baseFilename = 'sub-ctrl002_ses-002_task-testTask';
+    eventFilename = ['sub-ctrl002_ses-002_task-testTask_run-002_events_date-' ...
         cfg.fileName.date '.tsv'];
-    eyetrackerFilename =  ['sub-ctrl002_ses-002_task-testtask_run-002_eyetrack_date-' ...
+    eyetrackerFilename =  ['sub-ctrl002_ses-002_task-testTask_run-002_eyetrack_date-' ...
         cfg.fileName.date '.edf'];
 
     % make sure the func dir is created
@@ -93,7 +93,7 @@ function test_createFilename()
     cfg.subject.subjectNb = 3;
     cfg.subject.sessionNb = 1;
     cfg.subject.runNb = 1;
-    cfg.task.name = 'testtask';
+    cfg.task.name = 'testTask';
     cfg.dir.output = outputDir;
 
     cfg.testingDevice = 'eeg';