diff --git a/.DS_Store b/.DS_Store index 1724172..ff2311e 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/002 After Image GUI Project/AfIm_Exp.m b/002 After Image GUI Project/AfIm_Exp.m index 3edf289..9c42d92 100644 --- a/002 After Image GUI Project/AfIm_Exp.m +++ b/002 After Image GUI Project/AfIm_Exp.m @@ -80,7 +80,7 @@ theDate = fix(clock); % a = '/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/4 ColBackg AI' ;% folder where the program is. infoFile = sprintf('%s_SessionsInfo', subName) -aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs'); ;% folder where the program is. +aa = cd('/Users/clemente/Desktop/AfterImage Programs/A Outputs');% folder where the program is. checkfile = exist(infoFile, 'file') fo = fopen(infoFile, 'at') diff --git a/002 After Image GUI Project/AfIm_pupil_Exp.m b/002 After Image GUI Project/AfIm_pupil_Exp.m index a209875..f3fb7d3 100644 --- a/002 After Image GUI Project/AfIm_pupil_Exp.m +++ b/002 After Image GUI Project/AfIm_pupil_Exp.m @@ -60,7 +60,8 @@ redLut = [.8 0 0]; %% Save Session Information -theDate = datestr(now(),'mm/dd/yyyy HH:MM:SS'); +%theDate = datestr(now(),'mm/dd/yyyy HH:MM:SS'); +theDate = fix(clock); % a = '/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/4 ColBackg AI' ;% folder where the program is. infoFile = sprintf('%s%s_SessionsInfo', locOutDir, subName); 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 2a76910..d92b55b 100644 --- a/002 After Image GUI Project/AfIm_pupil_Exp_Rivalry.m +++ b/002 After Image GUI Project/AfIm_pupil_Exp_Rivalry.m @@ -58,7 +58,8 @@ redLut = [.8 0 0]; %% Save Session Information -theDate = datestr(now(),'mm/dd/yyyy HH:MM:SS'); +%theDate = datestr(now(),'mm/dd/yyyy HH:MM:SS'); +theDate = fix(clock); % a = '/Users/clemente/Dropbox/Luminotecnia/2018/Experiments/Color Background Afterimage/1 Programs/4 ColBackg AI' ;% folder where the program is. infoFile = sprintf('%s%s_SessionsInfo', locOutDir, subName); @@ -436,20 +437,20 @@ WaitSecs(AdaptTime) if ~Clock WaitSecs(18); % to tell the subject to blink normally flatSound; + else + Speak('Report Time') + + + WaitSecs(5)% This is sumed to the ISI except for the last trial + while ~keypress + if CharAvail + userRes = input(' '); + keypress = 1; + end + end + FlushEvents('mouseDown','keyDown'); end -% Speak('Report Time') - - -% WaitSecs(5)% This is sumed to the ISI except for the last trial -% % % % while ~keypress -% % % % if CharAvail -% % % % userRes = input(' '); -% % % % keypress = 1; -% % % % end -% % % % end -% % % % FlushEvents('mouseDown','keyDown'); - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % RESPONSES % diff --git a/002 After Image GUI Project/ContMatch_session.m b/002 After Image GUI Project/ContMatch_session.m index 149b188..390a23d 100644 --- a/002 After Image GUI Project/ContMatch_session.m +++ b/002 After Image GUI Project/ContMatch_session.m @@ -60,13 +60,21 @@ fprintf('\nLast calibration was %s\n', describe.date); fprintf('\nLast calibration was %s\n', describe.date); pix = pix/1001; maxLum = 20; %cd/m^2 +% +% lumMod_initial = [.6 .7 .8 1 ]; +% +% lCont_initial = [0.02 0.026 0.034 .04]; +% +% +% sCont = [.35 .5 .65 .8]; -lumMod_initial = [.6 .7 .8 1 ]; +lumMod_initial = [.7 .8 1 ]; -lCont_initial = [0.02 0.026 0.034 .04]; +lCont_initial = [0.026 0.034 .04]; -sCont = [.35 .5 .65 .8]; +sCont = [.5 .65 .8]; + % sCont = [.5 .5 .5 .5]; nCont = length(sCont);