diff --git a/.DS_Store b/.DS_Store index ff2311e..b9819cd 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/002 After Image GUI Project/AfIm_Exp_Rivalry.m b/002 After Image GUI Project/AfIm_Exp_Rivalry.m index 65f2a43..bdd5b61 100755 --- a/002 After Image GUI Project/AfIm_Exp_Rivalry.m +++ b/002 After Image GUI Project/AfIm_Exp_Rivalry.m @@ -372,6 +372,8 @@ try end Screen('FillArc', window, rampLeft(iFrames,:), tstCircleLeft, 0, 180); Screen('FillArc', window, rampRight(iFrames,:), tstCircleRight, 180, 180); + Screen('FillArc', window, wRGB.*.7, tstCircleRight, 0, 180); + Screen('FillArc', window, wRGB.*.7, tstCircleLeft, 180, 180); Screen('DrawDots', window, clockPosMat,clockPix, blackLut, [lftXCircleCenter,center(2)], 2); Screen('DrawDots', window, clockPosMat,clockPix, blackLut, [rhtXCircleCenter,center(2)], 2); Screen('DrawDots', window, [0 0],clockPix, 0, [lftXCircleCenter,center(2)], 2); % black dot for fixation diff --git a/002 After Image GUI Project/AfIm_pupil_Exp_Rivalry.m b/002 After Image GUI Project/AfIm_pupil_Exp_Rivalry.m index 751a823..7127608 100644 --- a/002 After Image GUI Project/AfIm_pupil_Exp_Rivalry.m +++ b/002 After Image GUI Project/AfIm_pupil_Exp_Rivalry.m @@ -3,6 +3,8 @@ Clock = 1; %%%%%%%%%%%%%%%% % ARDUINO and CAMERA settings +a = '/Users/mike/Documents/AfterImage/002 After Image GUI Project'; + Cam_freq = 240 ; % square waves freq Cam_RECduration = 30; %in seconds. (30secs is the maximal time allowed by Matlab to play tone in arduino board) ard = arduino; % open arduino @@ -29,7 +31,7 @@ hfpBG = bg_avg; -% cd(a); % return to program folder. +cd(a); % return to program folder. load('colorCalFile1.mat'); fprintf('\nLast calibration was %s\n', describe.date) pix = pix/1001; @@ -90,7 +92,7 @@ PsychImaging('PrepareConfiguration'); expScreen = 1; %create white LUT -% cd(a); +cd(a); % % % wLMS(1,1) = white(1,1)*maxLum; % % % wLMS(1,2) = (1-white(1,1))*maxLum; @@ -397,6 +399,13 @@ WaitSecs(AdaptTime) else Screen('FillArc', window, rampLeft(iFrames,:), tstCircleLeft, 0, 180); Screen('FillArc', window, rampRight(iFrames,:), tstCircleRight, 180, 180); + Screen('FillArc', window, wRGB.*.7, tstCircleRight, 0, 180); + Screen('FillArc', window, wRGB.*.7, tstCircleLeft, 180, 180); + +% if iFrames