Merge pull request #21 from CerenB/master

checkCFG update

Author: Remi-Gau

.gitignore

@@ -1,3 +1,4 @@
+
 *DS_Store
 
 *.m~
@@ -6,3 +7,4 @@
 # exclude content of logfiles folders
 *.tsv
 *.mat
+

checkCFG.m

@@ -1,4 +1,4 @@
-function expParameters = checkCFG(expParameters)
+function [expParameters, cfg] = checkCFG(cfg,expParameters)
 % check that we have all the fields that we need in the experiment
 % parameters
 
@@ -22,11 +22,21 @@
     'acq'       % For BIDS file naming: acquisition of fMRI images
     };
 
+fields2CheckFalse = { ...
+    'eyeTracker'
+    }
+
 for iField = 1:numel(fields2Check)
     if ~isfield(expParameters, fields2Check{iField})
         expParameters = setfield(expParameters, fields2Check{iField}, []); %#ok<SFLD>
     end
 end
 
+for iField = 1:numel(fields2CheckFalse)
+    if ~isfield(cfg, fields2CheckFalse{iField})
+        cfg = setfield(cfg, fields2CheckFalse{iField}, false); %#ok<SFLD>
+    end
+end
 
-end
+
+end

createFilename.m

@@ -1,4 +1,4 @@
-function expParameters = createFilename(expParameters, cfg)
+function expParameters = createFilename(cfg,expParameters)
 % create the BIDS compliant directories and filenames for the behavioral output for this subject /
 % session / run using the information from cfg and expParameters.
 % Will also create the right filename for the eyetracking data file.
@@ -30,7 +30,7 @@
 dateFormat = 'yyyymmdd_HHMM';
 
 % Setting some defaults: no need to change things here
-expParameters = checkCFG(expParameters);
+[expParameters, cfg] = checkCFG(cfg,expParameters);
 
 % extract input
 subjectGrp = expParameters.subjectGrp;
@@ -92,7 +92,7 @@
 [~, ~, ~] = mkdir(expParameters.outputDir);
 [~, ~, ~] = mkdir(fullfile(expParameters.outputDir, modality));
 
-if cfg.eyeTracker
+if isfield(cfg,'eyeTracker')
     [~, ~, ~] = mkdir(fullfile(expParameters.outputDir, 'eyetracker'));
 end
 
@@ -127,8 +127,8 @@
 
 end
 
+
 if cfg.eyeTracker
-    
     expParameters.fileName.eyetracker = ...
         [expParameters.fileName.base, expParameters.acqSuffix, ...
         runSuffix, '_eyetrack_date-' expParameters.date '.edf'];

tests/test_createFilename.m

@@ -14,8 +14,8 @@ function test_createFilename()
 cfg.eyeTracker = true;
 cfg.device = 'PC';
 
-expParameters = checkCFG(expParameters);
-expParameters = createFilename(expParameters, cfg);
+expParameters = checkCFG(cfg,expParameters);
+expParameters = createFilename(cfg,expParameters);
 
 outputDir = fullfile(pwd, ...
     '..', '..', ...
@@ -49,8 +49,8 @@ function test_createFilename()
 cfg.eyeTracker = false;
 cfg.device = 'scanner';
 
-expParameters = checkCFG(expParameters);
-expParameters = createFilename(expParameters, cfg);
+expParameters = checkCFG(cfg,expParameters);
+expParameters = createFilename(cfg,expParameters);
 
 outputDir = fullfile(pwd, ...
     '..', '..', ...

tests/test_saveEventsFile.m

@@ -13,8 +13,8 @@ function test_saveEventsFile()
 cfg.eyeTracker = false;
 cfg.device = 'scanner';
 
-expParameters = checkCFG(expParameters);
-expParameters = createFilename(expParameters, cfg);
+expParameters = checkCFG(cfg,expParameters);
+expParameters = createFilename(cfg,expParameters);