update functions to new cfg

Author: Remi-Gau

computeFOV.m

@@ -0,0 +1,8 @@
+function FOV = computeFOV(cfg)
+    % FOV = computeFOV(cfg)
+    % computes the number of degrees of visual angle in the whole field of view
+    %
+    
+    FOV = 2 * (180 * (atan(cfg.monitorWidth / (2 * cfg.screenDistance)) / pi));
+
+end

degToPix.m

@@ -6,6 +6,6 @@
     deg = getfield(structure, fieldName); %#ok<GFLD>
 
     structure = setfield(structure, [fieldName 'Pix'], ...
-        floor(cfg.ppd * deg)) ; %#ok<SFLD>
+        floor(cfg.screen.ppd * deg)) ; %#ok<SFLD>
 
 end

drawFixationCross.m

@@ -2,10 +2,10 @@ function drawFixationCross(cfg, color)
     % Define the parameters of the fixation cross in `cfg` and `expParameters`
 
     Screen('DrawLines', ...
-        cfg.win, ...
+        cfg.screen.win, ...
         cfg.allCoords, ...
         cfg.lineWidthPix, ...
         color, ...
-        [cfg.center(1) cfg.center(2)], 1);
+        [cfg.screen.center(1) cfg.screen.center(2)], 1);
 
 end

eyeTracker.m

@@ -1,6 +1,6 @@
 function [el, edfFile] = eyeTracker(input, cfg, varargin)
 
-    if ~cfg.eyeTracker
+    if ~cfg.eyeTracker.do
 
         el = [];
 

initPTB.m

@@ -14,34 +14,13 @@
     % - sound
     %
     % OUTPUT:
-    % cfg.keyboard = [];
-    % cfg.responseBox = [];
     %
-    % cfg.debug = true;
-    % cfg.testingTranspScreen = true;
-    % cfg.testingSmallScreen = true;
     %
-    % cfg.screen : screen numbers where drawing the stimulation (external screen if available)
-    % cfg.win : window opened by PTB
-    % cfg.winRect : window rectangule positiona and dimensions in pixel coordinates
-    % cfg.winWidth : window width in pixels
-    % cfg.winHeight : window height in pixels
-    % cfg.center : coordinate of the window center
-    % cfg.ppd : pixels per degree assuming the window fills the whole screen
-    % cfg.ifi : estimate of the monitor flip interval
-    % cfg.monRefresh : monitor refresh rate
-    % cfg.vbl : (I don't think this output is useful)
-    % cfg.textFont = 'Courier New';
-    % cfg.textSize = 18;
-    % cfg.textStyle = 1;
-    % cfg.backgroundColor = [0 0 0];
-    % cfg.monitorWidth = 42;
-    % cfg.screenDistance = 134;
-
-    % TO DO
-    % - We might want to add a couple of IF in case the experiment does not use audio for example.
 
     checkPtbVersion();
+    
+    pth = fileparts(mfilename('fullpath'));
+    addpath(fullfile(pth, 'subfun'));
 
     % For octave: to avoid displaying messenging one screen at a time
     more off;
@@ -63,36 +42,32 @@
     %% Visual
 
     % Get the screen numbers and draw to the external screen if avaliable
-    cfg.screen = max(Screen('Screens'));
+    cfg.screen.idx = max(Screen('Screens'));
 
     cfg = openWindow(cfg);
 
     % window size info
-    [cfg.winWidth, cfg.winHeight] = WindowSize(cfg.win);
-
-    %     if strcmpi(cfg.stimPosition, 'mri')
-    %         cfg.winRect(1, 4) = cfg.winRect(1, 4) * 2 / 3;
-    %     end
+    [cfg.screen.winWidth, cfg.screen.winHeight] = WindowSize(cfg.screen.win);
 
     % Get the Center of the Screen
-    cfg.center = [cfg.winRect(3), cfg.winRect(4)] / 2;
+    cfg.screen.center = [cfg.screen.winRect(3), cfg.screen.winRect(4)] / 2;
 
     % Computes the number of pixels per degree given the distance to screen and
     % monitor width
     % This assumes that the window fills the whole screen
-    cfg.FOV = computeFOV(cfg);
-    cfg.ppd = cfg.winRect(3) / cfg.FOV;
+    cfg.screen.FOV = computeFOV(cfg);
+    cfg.screen.ppd = cfg.winRect(3) / cfg.FOV;
 
     %% Select specific text font, style and size
     initText(cfg);
 
     %% Timing
     % Query frame duration
-    cfg.ifi = Screen('GetFlipInterval', cfg.win);
-    cfg.monRefresh = 1 / cfg.ifi;
+    cfg.screen.ifi = Screen('GetFlipInterval', cfg.win);
+    cfg.screen.monRefresh = 1 / cfg.ifi;
 
     % Set priority for script execution to realtime priority:
-    Priority(MaxPriority(cfg.win));
+    Priority(MaxPriority(cfg.screen.win));
 
     %% Warm up some functions
     % Do dummy calls to GetSecs, WaitSecs, KbCheck to make sure
@@ -102,17 +77,14 @@
     WaitSecs(0.1);
     GetSecs;
 
-    %% Initial flip to get a first time stamp
-    % Initially sync us to VBL at start of animation loop.
-    cfg.vbl = Screen('Flip', cfg.win);
 
 end
 
 function initDebug(cfg)
 
     % init PTB with different options in concordance to the debug Parameters
     Screen('Preference', 'SkipSyncTests', 0);
-    if cfg.debug
+    if cfg.debug.do
 
         Screen('Preference', 'SkipSyncTests', 2);
         Screen('Preference', 'Verbosity', 0);
@@ -128,7 +100,7 @@ function initDebug(cfg)
 
     end
 
-    if cfg.testingTranspScreen
+    if cfg.debug.transpWin
         PsychDebugWindowConfiguration;
     end
 
@@ -147,7 +119,7 @@ function initDebug(cfg)
 
 function cfg = initAudio(cfg)
 
-    if cfg.initAudio
+    if cfg.audio.do
 
         InitializePsychSound(1);
 
@@ -194,23 +166,16 @@ function initDebug(cfg)
 
 function cfg = openWindow(cfg)
 
-    if cfg.testingSmallScreen
-        [cfg.win, cfg.winRect] = Screen('OpenWindow', cfg.screen, cfg.backgroundColor, ...
+    if cfg.debug.smallWin
+        [cfg.screen.win, cfg.screen.winRect] = Screen('OpenWindow', cfg.screen.idx, cfg.color.background, ...
             [0, 0, 480, 270]);
     else
-        [cfg.win, cfg.winRect] = Screen('OpenWindow', cfg.screen, cfg.backgroundColor);
+        [cfg.screen.win, cfg.screen.winRect] = Screen('OpenWindow', cfg.screen.idx, cfg.color.background);
     end
 
     % Enable alpha-blending, set it to a blend equation useable for linear
     % superposition with alpha-weighted source.
-    Screen('BlendFunction', cfg.win, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-end
-
-function FOV = computeFOV(cfg)
-
-    % computes the number of degrees of visual angle in the whole field of view
-    FOV = 2 * (180 * (atan(cfg.monitorWidth / (2 * cfg.screenDistance)) / pi));
+    Screen('BlendFunction', cfg.screen.win, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 end
 

waitForTrigger.m

@@ -28,7 +28,7 @@ function waitForTrigger(cfg, deviceNumber)
         msg = 'Waiting for trigger';
         talkToMe(cfg, msg);
 
-        while triggerCounter < cfg.numTriggers
+        while triggerCounter < cfg.triggerNb
 
             keyCode = []; %#ok<NASGU>
 
@@ -42,7 +42,7 @@ function waitForTrigger(cfg, deviceNumber)
                 talkToMe(cfg, msg);
 
                 % we only wait if this is not the last trigger
-                if triggerCounter < cfg.numTriggers
+                if triggerCounter < cfg.triggerNb
                     pauseBetweenTriggers(cfg);
                 end
 
@@ -55,12 +55,12 @@ function talkToMe(cfg, msg)
 
     fprintf([msg, ' \n']);
 
-    if isfield(cfg, 'win')
+    if isfield(cfg, 'screen') && isfield(cfg.screen, 'win')
 
-        DrawFormattedText(cfg.win, msg, ...
+        DrawFormattedText(cfg.screen.win, msg, ...
             'center', 'center', cfg.text.color);
 
-        Screen('Flip', cfg.win);
+        Screen('Flip', cfg.screen.win);
 
     end
 
@@ -71,8 +71,8 @@ function pauseBetweenTriggers(cfg)
     % catch several triggers in one go.
 
     waitTime = 0.5;
-    if ~isempty(cfg.bids.MRI.repetitionTime)
-        waitTime = cfg.bids.MRI.repetitionTime / 2;
+    if ~isempty(cfg.mri.repetitionTime)
+        waitTime = cfg.mri.repetitionTime / 2;
     end
 
     WaitSecs(waitTime);