Synch with cpp_bids refactor

initPTB.m

@@ -72,7 +72,7 @@
     % window size info
     [cfg.winWidth, cfg.winHeight] = WindowSize(cfg.win);
 
-    if strcmpi(cfg.stimPosition, 'scanner')
+    if strcmpi(cfg.stimPosition, 'mri')
         cfg.winRect(1, 4) = cfg.winRect(1, 4) * 2 / 3;
     end
 

setDefaultsPTB.m

@@ -46,28 +46,36 @@
 
     end
 
-    if isfield(cfg, 'testingDevice') && strcmpi(cfg.testingDevice, 'scanner')
+    if isfield(cfg, 'testingDevice') && strcmpi(cfg.testingDevice, 'mri')
         fieldsToSet.MRI.repetitionTime = [];
     end
 
-    %% set the defaults
-    % loop through the defaults and set them in cfg if they don't exist
+    cfg = setDefaults(cfg, fieldsToSet);
+
+    % sort fields alphabetically
+    cfg = orderfields(cfg);
+
+end
+
+function structure = setDefaults(structure, fieldsToSet)
+    % loop through the defaults fiels to set and update if they don't exist
+
     names = fieldnames(fieldsToSet);
 
     for i = 1:numel(names)
-        cfg = setFieldToIfNotPresent( ...
-            cfg, ...
+
+        thisField = fieldsToSet.(names{i});
+        structure = setFieldToIfNotPresent( ...
+            structure, ...
             names{i}, ...
-            getfield(fieldsToSet, names{i})); %#ok<GFLD>
-    end
+            thisField);
 
-    %% sort fields alphabetically
-    cfg = orderfields(cfg);
+    end
 
 end
 
-function struct = setFieldToIfNotPresent(struct, fieldName, value)
-    if ~isfield(struct, fieldName)
-        struct = setfield(struct, fieldName, value); %#ok<SFLD>
+function structure = setFieldToIfNotPresent(structure, fieldName, value)
+    if ~isfield(structure, fieldName)
+        structure.(fieldName) = value;
     end
 end

waitForTrigger.m

@@ -23,7 +23,7 @@ function waitForTrigger(cfg, deviceNumber)
 
     triggerCounter = 0;
 
-    if strcmpi(cfg.testingDevice, 'scanner')
+    if strcmpi(cfg.testingDevice, 'mri')
 
         msg = 'Waiting for trigger';
         talkToMe(cfg, msg);