From ead2be3b19384ba749cf30f0b398753374c3612f Mon Sep 17 00:00:00 2001
From: mike <clawer87@gmail.com>
Date: Wed, 5 Aug 2020 12:03:40 -0500
Subject: [PATCH] Modifying afterimage pupil rivalry to add clock and
 reporting. -MT

---
 .DS_Store                                     | Bin 14340 -> 14340 bytes
 002 After Image GUI Project/AfIm_Exp.m        |   2 +-
 002 After Image GUI Project/AfIm_pupil_Exp.m  |   3 +-
 .../AfIm_pupil_Exp_Rivalry.m                  |  27 +++++++++---------
 .../ContMatch_session.m                       |  14 +++++++--
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 17241727a3409dfaf3e297733264f9b1f543d4e6..ff2311e5ffd6358a5506d9ada9b7e8170c516936 100644
GIT binary patch
delta 284
zcmZoEXerpBt;k_)W~ifJW@$Kir-0++5=AG*&6Bq)Drty{iiwL#NJ>h_3kWAACTFJ?
z<(KBAIOpf&7dhpWrbc8Y=jR1yR;5nnQrcA?FTh`%kzei!6bmRyEz3+Tk4`VjObISX
zOwP<pSGNDa00znq0WgLJgdxD73}G-Za0oDl<mKn3a&js=ctZs_7_=E28N3*R88R5k
z8TuGzF|1+O!Elt}7Q-8cZ;ULAVvI_R+KeU!jJAySj2?`hjNXg^jDd_n5baEiP-A3Z
rc0g#x=*fkOR-4x=XRvMNk^0TLncd(U%j6iTIg>3lls6w&^<V-3EPg=H

delta 290
zcmZoEXerpBt;k_!VyvTJZe%ifr-0++5=AG*eUrB<DjAB2ic5$}3Q5bv3kWAACTFJ?
z<(KBAIOpf&7dhpWrp62K7iZ*`dnV`S1r(*0Wu}%-W>nf$ACU<Z2+piZjZQDhObISX
zOwP<pSGNDa00x}O4jK@a0E04w!N8#GPy~_Y5MT_+%g;*%stSNeDm!>XRdFzAGdMB?
zGsG|yGBhwuXIRXzmEj=6Iflm!Um5;0@-m7sDluv^>KHMaGMY0wFnTh2G5RnDG6pe5
uLkwVIgc>9ZrJ)pK%H%>ttIbQ4GuS5YP<godhZZZ><UpzAn`f#fFaZDwN<x<a

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);