Merge pull request #23 from Remi-Gau/remi-expdesign

update design

Author: Remi-Gau

lib/CPP_BIDS

@@ -11,6 +11,7 @@
         'output');
 
     %% Debug mode settings
+    
     cfg.debug.do = true; % To test the script out of the scanner, skip PTB sync
     cfg.debug.smallWin = false; % To test on a part of the screen, change to 1
     cfg.debug.transpWin = true; % To test with trasparent full size screen
@@ -32,10 +33,14 @@
     cfg = setMRI(cfg);
 
     %% Experiment Design
-    cfg.names = {'static', 'motion'};
-    cfg.possibleDirections = [-1 1]; % 1 motion , -1 static
-    cfg.numBlocks = size(cfg.possibleDirections, 2);
-    cfg.numRepetitions = 1; % AT THE MOMENT IT IS NOT SET IN THE MAIN SCRIPT
+
+    cfg.design.names = {'static'; 'motion'};
+    cfg.design.nbRepetitions = 4;
+    cfg.design.nbEventsPerBlock = 12; % DO NOT CHANGE
+
+    %% Timing
+    
+    % Time between blocs in secs
     cfg.IBI = .5; % 8;
     % Time between events in secs
     cfg.ISI = 0.5;
@@ -44,25 +49,20 @@
     % Number of seconds after the end all the stimuli before ending the run
     cfg.endDelay = .1;
 
-    %% Visual Stimulation
-
-    % Number of events per block (should not be changed)
-    cfg.numEventsPerBlock = 12;
     cfg.eventDuration = 1; % second
+    
+    %% Visual Stimulation
 
-    % speed in visual angles / second
+    % Speed in visual angles / second
     cfg.dot.speed = 15;
     % Coherence Level (0-1)
     cfg.dot.coherence = 1;
-    % nb dots per visual angle square.
-    cfg.dot.density = .25;
-
+    % Number of dots per visual angle square.
+    cfg.dot.density = .1;
     % Dot life time in seconds
     cfg.dot.lifeTime = 10;
-
     % proportion of dots killed per frame
-    cfg.dot.proportionKilledPerFrame = .05;
-
+    cfg.dot.proportionKilledPerFrame = 0;
     % Dot Size (dot width) in visual angles.
     cfg.dot.size = 1;
     cfg.dot.color = cfg.color.white;
@@ -92,6 +92,7 @@
     cfg.target.duration = 0.05; % In secs
 
     cfg.extraColumns = {'direction', 'speed', 'target', 'event', 'block'};
+    
 end
 
 function cfg = setKeyboards(cfg)

lib/CPP_PTB

@@ -16,7 +16,7 @@
 
     %% Get parameters
 
-    dots = initializeDots(cfg, thisEvent);
+    dots = initDots(cfg, thisEvent);
 
     % Set for how many frames this event will last
     framesLeft = floor(cfg.eventDuration / cfg.screen.ifi);