Merge pull request #28 from Remi-Gau/master

fix eyetracker folder automatic creation

Author: Remi-Gau

createFilename.m

@@ -92,7 +92,7 @@
 [~, ~, ~] = mkdir(expParameters.outputDir);
 [~, ~, ~] = mkdir(fullfile(expParameters.outputDir, modality));
 
-if isfield(cfg,'eyeTracker')
+if cfg.eyeTracker
     [~, ~, ~] = mkdir(fullfile(expParameters.outputDir, 'eyetracker'));
 end
 

tests/test_createFilename.m

@@ -11,13 +11,13 @@ function test_createFilename()
 expParameters.task = 'testtask';
 expParameters.verbose = 1;
 
-cfg.eyeTracker = true;
+cfg.eyeTracker = false;
 cfg.device = 'PC';
 
 expParameters = checkCFG(cfg,expParameters);
 expParameters = createFilename(cfg,expParameters);
 
-outputDir = fullfile(pwd, ...
+behDir = fullfile(pwd, ...
     '..', '..', ...
     'output', 'source', 'sub-001', 'ses-001', 'beh');
 
@@ -26,16 +26,16 @@ function test_createFilename()
     'output', 'source', 'sub-001', 'ses-001', 'eyetracker');
 
 
-assert(exist(outputDir, 'dir')==7)
-assert(exist(eyetrackerDir, 'dir')==7)
+assert(exist(behDir, 'dir')==7)
+
+% make sure the eyetracker dir is not created
+assert(exist(eyetrackerDir, 'dir')==0) 
+
 assert(strcmp(...
               expParameters.fileName.events, ...
               ['sub-001_ses-001_task-testtask_run-001_events_date-' expParameters.date '.tsv']));
-assert(strcmp(...
-              expParameters.fileName.eyetracker, ...
-              ['sub-001_ses-001_task-testtask_run-001_eyetrack_date-' expParameters.date '.edf']));
-
 
+          
 %% check directory and filename creation (fMRI)
 
 clear
@@ -46,24 +46,26 @@ function test_createFilename()
 expParameters.runNb = 2;
 expParameters.task = 'testtask';
 
-cfg.eyeTracker = false;
+cfg.eyeTracker = true;
 cfg.device = 'scanner';
 
-expParameters = checkCFG(cfg,expParameters);
-expParameters = createFilename(cfg,expParameters);
-
-outputDir = fullfile(pwd, ...
-    '..', '..', ...
-    'output', 'source', 'sub-ctrl002', 'ses-002', 'func');
+outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
 
-eyetrackerDir = fullfile(pwd, ...
-    '..', '..', ...
-    'output', 'source', 'sub-ctrl002', 'ses-002', 'eyetracker');
+funcDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'func');
+eyetrackerDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'eyetracker');
 
+expParameters.outputDir = outputDir;
+expParameters = checkCFG(cfg,expParameters);
+expParameters = createFilename(cfg,expParameters);
 
-assert(exist(outputDir, 'dir')==7)
+assert(exist(funcDir, 'dir')==7)
+assert(exist(eyetrackerDir, 'dir')==7)
 assert(strcmp(expParameters.fileName.base, 'sub-ctrl002_ses-002_task-testtask'))
 assert(strcmp(...
               expParameters.fileName.events, ...
               ['sub-ctrl002_ses-002_task-testtask_run-002_events_date-' expParameters.date '.tsv']));
+          
+assert(strcmp(...
+              expParameters.fileName.eyetracker, ...
+              ['sub-ctrl002_ses-002_task-testtask_run-002_eyetrack_date-' expParameters.date '.edf']));