From 3cecbd76868417d67a20936c8f4695cf9d217ca0 Mon Sep 17 00:00:00 2001 From: Michael Tan Date: Mon, 4 Jan 2021 10:57:09 -0600 Subject: [PATCH] Updating numerous bug fixes. --- .DS_Store | Bin 14340 -> 14340 bytes .../AfIm_Exp_Rivalry.m | 2 ++ .../AfIm_pupil_Exp_Rivalry.m | 24 +++++++++++++----- .../Disp_Color_Rivalry.m | 16 ++++++++++-- 002 After Image GUI Project/untitled.m | 1 + .../1Chros-Sample.txt | 2 ++ .../1_CHROS_temporary.txt | 7 +++++ .../1_CHROS_test.txt | 10 ++++++-- .../OneEnd_3_CHROS_3axis.txt | 10 ++++++++ 9 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 002 After Image GUI Project/untitled.m create mode 100644 Experimental Conditions (zaidi paradigm)/1Chros-Sample.txt create mode 100644 Experimental Conditions (zaidi paradigm)/1_CHROS_temporary.txt create mode 100644 Experimental Conditions (zaidi paradigm)/OneEnd_3_CHROS_3axis.txt diff --git a/.DS_Store b/.DS_Store index ff2311e5ffd6358a5506d9ada9b7e8170c516936..b9819cd652d2f7ac82f88a06a23c5529cac54638 100644 GIT binary patch delta 1571 zcmeH`U2Icj7{{M~H|VK5tf%X`uBTl;*15TjNr!cgiMpm^;bUYH%YcECGtQY-`bAq8 zqv+5Kry!B>LP8Y$2m!yrT1AC%LkQ8SA^5RCG!c!Ocq56}aMUynk&NY0_ewW*o4``Y$&?UM|U(lEI z1N}rl(<}%UTmumcPz5(U@WO`%wBdS$(2kqXjR>OXK_Av)02?rfEl41VG%^^&Sy^x-9@cw_7@cLfHx2xl?iu|Zcc)s*Ebf^533WpxW$`GgMs`Vw?uDVCuZ z%drBh5aUzUVZAX$#R%?399iUWA4YLM9>Jp+$4*ROFD8x2hj5rhygnQ&D&AL6xUzUY z%*HBu{R(@=`DZa7*lEH(X05I<%h8@?_Fj=~uXnMfo)(t0b+UUK{N75Z$A4|hqVSSi zKeI}a?o&sM6cQT&2z> z%NzAdG^_EyDhS4fK)o!+a`6W=NhvipHi=?vYdob&xzeMp3q^TtLK)T)l4_Z|7HSve zb)#A~7mKG;(yG$wjUA%AeoH!;dC?V*G80=-2i=^Z*tAJPnm z=6m{)L-Py$O22V%7QhM#Hppm16RzX9bfD9)G|KH<$?epk*@!zagu8GL2S&FtkB9IW zp1>~bhI>Db;3$saMZAFm-ozBn;5;ti623Nk{YE!aOyov0!-@1Tk?A0}QZBQu{HKjR z`{l|x_Z&6OlATfZnx~&Fa)bp@lt{OaZFQ`1b^CmhVC;q)>8@zU z$LK1}(jTZmEdqQCZ5-;`cw~AEsQa-7cNkC)VKat#bW|fc+l)AjoJVJ delta 2521 zcmds2ZERCj7=E8_gL}skBAI9rby9>v>YEvm#R^=BW#FTU{1K^w?4$pn zaIHVs=J5wTe3Vb7gZy#)tu@|jiyCl!46~y?I#x&&s`We;XAMtRI5fP*X-~-S3r7kH zzJ@L#F=@zW%T2Rol^4Xe5D$$v z+p--~rX#zWE%uY4HDK-V%?aEN9C4J(g46Ai}j-|h))8kv)>5FvB zS%MIokZH{l+~nxpua#6k%Dw&VlteVifJf8DQ038 zYS4g((1;aS4IkFPkG1GQFZ!?^8?Y76VH*bU5_V$`-a!989KvB7!TUIdQ#g&YIERb) z0l(l^T)}U+p-a$7I)g4XrkrlXG7sJ~i`LPZ_$R()hK;RzWyIK{9g`~QZS!kt>!hl< zmYH$OGUvyuJ~5ioCYbFxlk;6=b1HB0e;eiOLT+}FMl91iDg~QOR&^0rv!fy1DoHYl z;*e^ts$82SgCCvS)VQM-U(f~mk*?7Vu0ay?NQDg!&c6$DP|ew2fQ6{X60~3$mZKF4 zR&gC3<4Q!Z4v(XotFZx_@C>%#S!~A(T#J{n1ADO#wl}dK2k;KwLzJs>lxuPvC-4bZ zWeAt>9qY-nnZJ+EbaX)8p+f`9GoDN^=)%#f#xZc8p|kWko#&9hrAzb^{Z4<-H2}#N z$Dxmh5gD-Z1nkJ+DdeLN)47c*P>H#ir=`)XrQt<80tj&{J;^~c4*JEIh1k+G8xFF3 zOB4GnZ5*1T=hGZe_h$*_WA#(GH*Yy}Hs@zPYEj1-TC6d&lr!Yj7+TF43Tq5?afY7O z7~0Gk8srSA+r5U@S&GGm1JQiT+Z;dJn>mwJ+uhm!wOqEwFPBBdg-&~MS>gXHm(jhM zTXYi}MhyPVsFG-@FjXe=>Q}`!8BJ_gu8n(rFq${Wa7|3cr22 z`T2jIw$U!yM~CQL`j9@Qle`k#O+k(SR`ji5MLEAYyxxx--sX6@O`NB%9-W(=`6lcb z7QZ9oPPwr`bKzZe$Nrc*G+PYi8JS`)89XC1kDa?jUSbZnDFLr9uxc5oa5u0Lq^&U1~%|95&QH}rr 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