fix minor bugs

Author: Remi-Gau

demos/CPP_waitForTriggerDemo.m

@@ -2,9 +2,9 @@
 
 cfg.testingDevice = 'mri';
 
-cfg.numTriggers = 4;
+cfg.mri.triggerNb = 4;
 
-cfg.triggerKey = 'space';
+cfg.mri.triggerKey = 'space';
 
 KbName('UnifyKeyNames');
 

initPTB.m

@@ -2,7 +2,7 @@
     % This will initialize PsychToolBox
     % - screen
     % - the windon opened takes the whole screen unless
-    % cfg.testingSmallScreen is set to true
+    % cfg.screen.smallWin is set to true
     % - debug mode : skips synch test and warnings
     % - window transparency enabled by cfg.testingTranspScreen set to true
     % - gets the flip interval

setDefaultsPTB.m

@@ -77,7 +77,7 @@
         if isfield(structure, names{i}) && isstruct(structure.(names{i}))
 
             structure.(names{i}) = ...
-                setDefaultFields(structure.(names{i}), fieldsToSet.(names{i}));
+                setDefaults(structure.(names{i}), fieldsToSet.(names{i}));
 
         else
 

waitForTrigger.m

@@ -28,21 +28,21 @@ function waitForTrigger(cfg, deviceNumber)
         msg = 'Waiting for trigger';
         talkToMe(cfg, msg);
 
-        while triggerCounter < cfg.triggerNb
+        while triggerCounter < cfg.mri.triggerNb
 
             keyCode = []; %#ok<NASGU>
 
             [~, keyCode] = KbPressWait(deviceNumber);
 
-            if strcmp(KbName(keyCode), cfg.triggerKey)
+            if strcmp(KbName(keyCode), cfg.mri.triggerKey)
 
                 triggerCounter = triggerCounter + 1 ;
 
                 msg = sprintf(' Trigger %i', triggerCounter);
                 talkToMe(cfg, msg);
 
                 % we only wait if this is not the last trigger
-                if triggerCounter < cfg.triggerNb
+                if triggerCounter < cfg.mri.triggerNb
                     pauseBetweenTriggers(cfg);
                 end
 
@@ -71,7 +71,7 @@ function pauseBetweenTriggers(cfg)
     % catch several triggers in one go.
 
     waitTime = 0.5;
-    if ~isempty(cfg.mri.repetitionTime)
+    if isfield(cfg, 'mri') && isfield(cfg.mri, 'repetitionTime') && ~isempty(cfg.mri.repetitionTime)
         waitTime = cfg.mri.repetitionTime / 2;
     end