Merge pull request #45 from Remi-Gau/remi-changes_from_liege

changes from liege

Author: Remi-Gau

initEnv.m

@@ -101,6 +101,6 @@ function addDependencies()
     pth = fileparts(mfilename('fullpath'));
     addpath(genpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src')));
     addpath(genpath(fullfile(pth, 'lib', 'CPP_PTB', 'src')));
-    addpath(fullfile(pth, 'subfun'));
+    addpath(genpath(fullfile(pth, 'subfun')));
 
 end

lib/CPP_BIDS

@@ -1,5 +1,7 @@
 function [cfg] = setParameters()
 
+    % VISUAL LOCALIZER
+
     % Initialize the parameters and general configuration variables
     cfg = struct();
 
@@ -21,7 +23,7 @@
     %% Engine parameters
 
     cfg.testingDevice = 'mri';
-    cfg.eyeTracker.do = false;
+    cfg.eyeTracker.do = true;
     cfg.audio.do = false;
 
     cfg = setMonitor(cfg);
@@ -41,7 +43,7 @@
     cfg.design.motionType = 'translation';
     cfg.design.motionDirections = [0 0 180 180];
     cfg.design.names = {'static'; 'motion'};
-    cfg.design.nbRepetitions = 10;
+    cfg.design.nbRepetitions = 8;
     cfg.design.nbEventsPerBlock = 12; % DO NOT CHANGE
 
     %% Timing
@@ -52,10 +54,10 @@
     % IBI
     % block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
 
-    cfg.timing.eventDuration = 0.850; % second
+    cfg.timing.eventDuration = 0.8; % second
 
     % Time between blocs in secs
-    cfg.timing.IBI = 1.8;
+    cfg.timing.IBI = 0;
     % Time between events in secs
     cfg.timing.ISI = 0;
     % Number of seconds before the motion stimuli are presented
@@ -72,7 +74,7 @@
         cfg.timing.eventDuration = cfg.mri.repetitionTime / 2 - 0.04; % second
 
         % Time between blocs in secs
-        cfg.timing.IBI = 1;
+        cfg.timing.IBI = 0;
         % Time between events in secs
         cfg.timing.ISI = 0;
         % Number of seconds before the motion stimuli are presented
@@ -94,7 +96,7 @@
     % proportion of dots killed per frame
     cfg.dot.proportionKilledPerFrame = 0;
     % Dot Size (dot width) in visual angles.
-    cfg.dot.size = .2;
+    cfg.dot.size = .1;
     cfg.dot.color = cfg.color.white;
 
     % Diameter/length of side of aperture in Visual angles
@@ -143,7 +145,7 @@
 function cfg = setMRI(cfg)
     % letter sent by the trigger to sync stimulation and volume acquisition
     cfg.mri.triggerKey = 't';
-    cfg.mri.triggerNb = 0;
+    cfg.mri.triggerNb = 5;
 
     cfg.mri.repetitionTime = 1.8;
 

lib/CPP_PTB

@@ -171,7 +171,7 @@
 
     eyeTracker('Shutdown', cfg);
 
-    createBoldJson(cfg, cfg);
+    createJson(cfg, cfg);
 
     farewellScreen(cfg);