Updating numerous bug fixes.

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

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<nFrames
+%                         Screen('FillArc', window, mean(rampRight), tstCircleLeft, 180, 180);
+%                         Screen('FillArc', window, mean(rampLeft), tstCircleRight, 0, 180);
+%                     end
                 end
                 
                 Screen('DrawText', window, TrialCountStr, 20, 20, redLut, wRGB);
@@ -455,9 +464,10 @@ WaitSecs(AdaptTime)
             end
             Priority(0);
 
-            WaitSecs(18); % to tell the subject to blink normally
+            
             
             if ~Clock
+                WaitSecs(18); % to tell the subject to blink normally
             flatSound;
 %             else
 %                Speak('Report Time')
@@ -534,7 +544,7 @@ end
 
 if strcmp('DELETE',kbName)==1 %-si es el backspace --limpiar numero
     kbName = []% ;
-    userRes = kbName
+    userRes = kbName;
     firstDigit = [];
     Digit = 0;
     DrawFormattedText(window, kbName, 400, 512, redLut);
@@ -571,7 +581,7 @@ Screen('TextSize', window, 14);
             
 %aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs');
 % aa = cd('D:\Dropbox\Luminotecnia\2017\Chicago Lab files\2 Experiments\Color AfterImage_Exp_Room_150\2nd\1 Programs\A Outputs')
-%cd
+cd(a);
 WaitSecs(.2)
 
             time = clock;
@@ -584,8 +594,8 @@ WaitSecs(.2)
 % a = cd('/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/4 ColBackg AI'); %
 % a = cd('D:\Dropbox\Luminotecnia\2017\Chicago Lab files\2 Experiments\Color AfterImage_Exp_Room_150\2nd\1 Programs\4 AfterImage'); %
 
-           cd
            
+            cd(a);
             WaitSecs(.2)
          
             

002 After Image GUI Project/Disp_Color_Rivalry.m

@@ -138,6 +138,8 @@ Screen('FillRect', window, wRGB.*2);
 %
 % % end
 
+bg = wRGB;
+
 % if EEW_Subj
 wRGB(1,1) = wRGB(1,1)*hfpRG;
 wRGB(1,2) = wRGB(1,2);
@@ -146,8 +148,18 @@ wRGB(1,3) = wRGB(1,3)*hfpBG;
 %Screen('FillOval', window, wRGB, centeredRect, maxDiameter); % Draw the rect to the screen
 % Screen('FillOval', window, wRGB, centeredRect1, maxDiameter); % Draw the rect to the screen
 % Screen('FillOval', window, wRGB, centeredRect2, maxDiameter); % Draw the rect to the screen
-Screen('FillArc', window, wRGB, tstCircleLeft, 0, 180);
+Screen('FillArc', window, [1,0,0], tstCircleLeft, 0, 180);
-Screen('FillArc', window, wRGB.*1.5 , tstCircleRight, 180, 180);
+Screen('FillArc', window, [0,0,1] , tstCircleRight, 180, 180);
+
+Screen('FillArc', window, bg.*0.7, tstCircleRight, 0, 180);
+Screen('FillArc', window, bg.*0.7, tstCircleLeft, 180, 180);
+
+% Screen('FillArc', window, wRGB, tstCircleLeft, 0, 180);
+% Screen('FillArc', window, wRGB.*1.5 , tstCircleRight, 180, 180);
+% 
+% Screen('FillArc', window, wRGB.*.8, tstCircleRight, 0, 180);
+% Screen('FillArc', window, wRGB.*1.5.*.8, 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

002 After Image GUI Project/untitled.m

@@ -0,0 +1 @@
+screen('CloseAll')

Experimental Conditions (zaidi paradigm)/1Chros-Sample.txt

@@ -0,0 +1,2 @@
+Luminance , Chro_littL , Chro_littS , AdaptTime, nRep, l_axis, s_axis , lum_axis , l_s_45 , l_s_135 , lum_l_45 , lum_l_135 , lum_s_45 , lum_s_135
+20, 0.665 , 1.00 , 60 , 1 , 0 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0, 

Experimental Conditions (zaidi paradigm)/1_CHROS_temporary.txt

@@ -0,0 +1,7 @@
+Luminance , Chro_littL , Chro_littS , AdaptTime, nRep, l_axis s_axis , lum_axis , l_s_45 , l_s_135 , lum_l_45 , lum_l_135 , lum_s_45 , lum_s_135
+20, 0.665 , 2.000 , 60, 2 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 ,
+
+
+
+
+

Experimental Conditions (zaidi paradigm)/1_CHROS_test.txt

@@ -1,2 +1,8 @@
-Luminance , Chro_littL , Chro_littS , AdaptTime, nRep, l_axis, s_axis , lum_axis , l_s_45 , l_s_135 , lum_l_45 , lum_l_135 , lum_s_45 , lum_s_135
+Luminance , Chro_littL , Chro_littS , AdaptTime, nRep, l_axis s_axis , lum_axis , l_s_45 , l_s_135 , lum_l_45 , lum_l_135 , lum_s_45 , lum_s_135
-20, 0.665 , 1.00 , 60 , 3 , 0 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 0, 
+20, 0.665 , 1.000 , 60, 3 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 
+20, 0.665 , 2.000 , 60, 3 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 ,
+20, 0.665 , 3.000 , 60, 3 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 ,
+
+
+
+

Experimental Conditions (zaidi paradigm)/OneEnd_3_CHROS_3axis.txt

@@ -0,0 +1,10 @@
+Luminance , Chro_littL , Chro_littS , AdaptTime, nRep, l_axis s_axis , lum_axis , l_s_45 , l_s_135 , lum_l_45 , lum_l_135 , lum_s_45 , lum_s_135
+20, 0.641 , 1.000 , 60, 3 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 , 
+20, 0.683 , 1.000 , 60, 3 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 ,
+20, 0.689 , 1.000 , 60, 3 , 1 , 1 , 1 , 0 , 0 , 0 , 0 , 0 , 0 ,
+
+  
+
+
+
+