Local laptop changes

mjaquiery · Jan 11, 2018 · 60d2e99 · 60d2e99
1 parent d263946
commit 60d2e99
Show file tree

Hide file tree

Showing 450 changed files with 27 additions and 16 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/AdvisorChoice/build_trials.m b/AdvisorChoice/build_trials.m
diff --git a/AdvisorChoice/main.m b/AdvisorChoice/main.m
diff --git a/AdvisorChoice/screenTests.m b/AdvisorChoice/screenTests.m
diff --git a/AdvisorChoice/set_cfg_settings.m b/AdvisorChoice/set_cfg_settings.m
diff --git a/AdvisorChoice/set_cfg_text.m b/AdvisorChoice/set_cfg_text.m
diff --git a/HaloEffect/build_trials.m b/HaloEffect/build_trials.m
diff --git a/HaloEffect/main.m b/HaloEffect/main.m
diff --git a/HaloEffect/screenTests.m b/HaloEffect/screenTests.m
diff --git a/HaloEffect/set_cfg_settings.m b/HaloEffect/set_cfg_settings.m
diff --git a/HaloEffect/set_cfg_text.m b/HaloEffect/set_cfg_text.m
diff --git a/HaloEffect/xml2struct.m b/HaloEffect/xml2struct.m
diff --git a/NetLogo/biased_trust.nlogo b/NetLogo/biased_trust.nlogo
diff --git a/PoliticalDifferences/analysis/checkPoliticalInfo.m b/PoliticalDifferences/analysis/checkPoliticalInfo.m
diff --git a/PoliticalDifferences/analysis/prepR.m b/PoliticalDifferences/analysis/prepR.m
diff --git a/PoliticalDifferences/build_trials.m b/PoliticalDifferences/build_trials.m
diff --git a/PoliticalDifferences/main.m b/PoliticalDifferences/main.m
@@ -48,7 +48,8 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 cfg.fps = Sc.fps;                                                               % refresh rate (Hz). IMPORTANT! Make sure this value equals the RR of the screen used AND the RR in the start_psychtb.m function
-cfg.frame = (1/cfg.fps);                                                     % average duration (ms) of a frame
+cfg.frame = (1/cfg.fps); % average duration (ms) of a frame
+if isinf(cfg.frame), cfg.frame = 1/59.9; end
 if ~isempty(subject.id)
     ListenChar(2);
     HideCursor();
@@ -100,6 +101,7 @@
         disp(['agree?: ' num2str(trials(t-1).agree)]);
         disp('------------------------------------------');
     else
+        Beeper();
         [~, ~, SECSscore] = SECS(true); % get political leaning responses
     end
     %% save and break
@@ -149,12 +151,12 @@
         if isnan(trials(t-1).advisorId) % last trial was a null trial so search for a trial with an advisorId
            for n = t-cfg.block.trialset_count*(cfg.trialset.real+cfg.trialset.null):t+cfg.block.trialset_count*(cfg.trialset.real+cfg.trialset.null)
                if n>0 && trials(n).block == trials(t-1).block && ~isnan(trials(n).advisorId)
-                   trials(t).advisorPoliticsQ = showAdvisorPolitics(trials(t).advisorId);
+                   trials(t).advisorPoliticsQ = showAdvisorPolitics(trials(n).advisorId);
                    break;
                end
            end
         else
-            trials(t).advisorPoliticsQ = showAdvisorPolitics(trials(t).advisorId);
+            trials(t).advisorPoliticsQ = showAdvisorPolitics(trials(t-1).advisorId);
         end
         WaitSecs(3);
     end
@@ -225,9 +227,9 @@
     cfg.currentTrial = trials(t);
 
     %% Advisor stuff
-    if trials(t).block>1
+    %if trials(t).block>1
         PsychPortAudio('Close');
-    end
+    %end
 
     %% Choice of advisor
     if ~isempty(trials(t).choice)
@@ -300,7 +302,7 @@
 
     %% feedback
     if trials(t).block<3
-        if ~trials(t).cor, Beeper; end
+        if ~trials(t).cor, Beeper(); end
         %colors=[.8 .2 .2;.2 .8 .2];
         PsychPortAudio('Close');
     end

diff --git a/PoliticalDifferences/screenTests.m b/PoliticalDifferences/screenTests.m
diff --git a/PoliticalDifferences/set_cfg_settings.m b/PoliticalDifferences/set_cfg_settings.m
diff --git a/PoliticalDifferences/set_cfg_text.m b/PoliticalDifferences/set_cfg_text.m
@@ -16,7 +16,7 @@
 
 cfg.instr.instr.text            = {'Left click with your mouse to make a decision.' ...
     'Press spacebar to confirm response.'};
-cfg.instr.instr.position.y          = 80;
+cfg.instr.instr.position.y          = 180;
 cfg.instr.instr.position.lineHeight = 20;
 
 cfg.instr.estimated_obsacc.text = {'Your overall baseline accuracy (before any advice) was 71%' ...
@@ -43,7 +43,7 @@
             'How trustworthy will be the opinions of this person?'...
             'How much will you be influenced by the opinions of this person?'};
 cfg.instr.Q.a.text              = {'Extremely' 'Fairly' 'Not so much' 'Not at all'};
-cfg.instr.Q.position.instr.y        = Sc.size(2)*.9;
+cfg.instr.Q.position.instr.y        = 600*.9;
 cfg.instr.Q.position.instr.gap      = 30;
 cfg.instr.Q.position.labelOffsetY   = 40; % distance between questionnaire bar and labels
 cfg.instr.Q.position.advisorY       = Sc.size(2)*.05+cfg.display.portrait.height/2; % centre of the advisor portrait

diff --git a/README.md b/README.md
diff --git a/Results/.DS_Store b/Results/.DS_Store
diff --git a/Results/PoliticalDifferences/2/2018-01-11T131937_2_0.mat b/Results/PoliticalDifferences/2/2018-01-11T131937_2_0.mat
diff --git a/Results/PoliticalDifferences/2/2018-01-11T132759_2_0.mat b/Results/PoliticalDifferences/2/2018-01-11T132759_2_0.mat
diff --git a/Results/PoliticalDifferences/2/2018-01-11T132759_2_1.mat b/Results/PoliticalDifferences/2/2018-01-11T132759_2_1.mat
diff --git a/Results/PoliticalDifferences/2/2018-01-11T132759_2_final.mat b/Results/PoliticalDifferences/2/2018-01-11T132759_2_final.mat
diff --git a/Results/PoliticalDifferences/2/2018-01-11T132759_2_final_R.mat b/Results/PoliticalDifferences/2/2018-01-11T132759_2_final_R.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T130607_999_0.mat b/Results/PoliticalDifferences/test/2018-01-11T130607_999_0.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T131246_999_0.mat b/Results/PoliticalDifferences/test/2018-01-11T131246_999_0.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T131246_999_1.mat b/Results/PoliticalDifferences/test/2018-01-11T131246_999_1.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T131246_999_final.mat b/Results/PoliticalDifferences/test/2018-01-11T131246_999_final.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T131246_999_final_R.mat b/Results/PoliticalDifferences/test/2018-01-11T131246_999_final_R.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T133453_999_0.mat b/Results/PoliticalDifferences/test/2018-01-11T133453_999_0.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T133453_999_1.mat b/Results/PoliticalDifferences/test/2018-01-11T133453_999_1.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T133453_999_final.mat b/Results/PoliticalDifferences/test/2018-01-11T133453_999_final.mat
diff --git a/Results/PoliticalDifferences/test/2018-01-11T133453_999_final_R.mat b/Results/PoliticalDifferences/test/2018-01-11T133453_999_final_R.mat
diff --git a/analysis/agreement_functions.m b/analysis/agreement_functions.m
diff --git a/analysis/check_agreementf.m b/analysis/check_agreementf.m
diff --git a/analysis/diagnostics.m b/analysis/diagnostics.m
diff --git a/analysis/fitdistribution.m b/analysis/fitdistribution.m
diff --git a/analysis/plotX.m b/analysis/plotX.m
diff --git a/analysis/zinf_between_subjects_anova3.csv b/analysis/zinf_between_subjects_anova3.csv
diff --git a/core/GetMouseWrapper.m b/core/GetMouseWrapper.m
diff --git a/core/SECS.m b/core/SECS.m
diff --git a/core/ShowCursorCenter.m b/core/ShowCursorCenter.m
diff --git a/core/add_fixation.m b/core/add_fixation.m
diff --git a/core/add_responseinstr.m b/core/add_responseinstr.m
@@ -28,8 +28,8 @@
 oldTextSize = Screen('TextSize', Sc.window, cfg.instr.textSize.small);
 Screen('TextFont', Sc.window, 'Myriad Pro');
 DrawFormattedText(Sc.window, cfg.instr.instr.text{1}, 'center', ...
-    (Sc.rect(4)).*cfg.bar.positiony+drawCode, 0);
+    (Sc.rect(4)*cfg.bar.positiony)+drawCode, 0);
 DrawFormattedText(Sc.window, cfg.instr.instr.text{2}, 'center', ...
-    (Sc.rect(4)).*cfg.bar.positiony+drawCode+cfg.instr.instr.position.lineHeight, 0);
+    (Sc.rect(4)*cfg.bar.positiony)+drawCode+cfg.instr.instr.position.lineHeight, 0);
 Screen('TextSize', Sc.window, oldTextSize);
 
diff --git a/core/agreementf.m b/core/agreementf.m
diff --git a/core/audioread.m b/core/audioread.m
diff --git a/core/check_agreementf b/core/check_agreementf
diff --git a/core/collect_response.m b/core/collect_response.m
diff --git a/core/confidenceSlider/add_responseinstr.m b/core/confidenceSlider/add_responseinstr.m
diff --git a/core/confidenceSlider/define_scale.m b/core/confidenceSlider/define_scale.m
diff --git a/core/confidenceSlider/display_response_.m b/core/confidenceSlider/display_response_.m
diff --git a/core/confidenceSlider/drag_slider.m b/core/confidenceSlider/drag_slider.m
diff --git a/core/confidenceSlider/draw_landmarks.m b/core/confidenceSlider/draw_landmarks.m
diff --git a/core/confidenceSlider/draw_scale_.m b/core/confidenceSlider/draw_scale_.m
diff --git a/core/confidenceSlider/draw_static.m b/core/confidenceSlider/draw_static.m
diff --git a/core/confidenceSlider/getAdvisorChoice.m b/core/confidenceSlider/getAdvisorChoice.m
diff --git a/core/create_subject_directory.m b/core/create_subject_directory.m
@@ -37,8 +37,8 @@
 %%-- saving directory
 subject.dir = subject.name;
 % create directory if does not already exist
-if ~exist([results_path subject.dir], 'dir') 
-    mkdir([results_path subject.dir]);
+if ~exist([results_path osSlash subject.dir], 'dir') 
+    mkdir([results_path osSlash subject.dir]);
 end
 
 %-- Unique filename depending on computer clock (avoids overwriting)

diff --git a/core/debugTrialInfo.m b/core/debugTrialInfo.m
diff --git a/core/defineQuiz.m b/core/defineQuiz.m
diff --git a/core/defineSECS.m b/core/defineSECS.m
diff --git a/core/define_rectangles.m b/core/define_rectangles.m
diff --git a/core/display_computerconf b/core/display_computerconf
diff --git a/core/doDotTask.m b/core/doDotTask.m
diff --git a/core/doQuizTask.m b/core/doQuizTask.m
diff --git a/core/drag_slider.asv b/core/drag_slider.asv
diff --git a/core/drawAdvisor.m b/core/drawAdvisor.m
diff --git a/core/drawSECS.m b/core/drawSECS.m
diff --git a/core/draw_progression_bar.m b/core/draw_progression_bar.m
diff --git a/core/estimated_obsacc.m b/core/estimated_obsacc.m
diff --git a/core/feedback_interblock.m b/core/feedback_interblock.m
diff --git a/core/fixationFlicker.m b/core/fixationFlicker.m
diff --git a/core/getABBA.m b/core/getABBA.m
diff --git a/core/getAdvisorName.m b/core/getAdvisorName.m
diff --git a/core/getNewTrial.m b/core/getNewTrial.m
diff --git a/core/getRandomAdvisor.m b/core/getRandomAdvisor.m
diff --git a/core/getTriangle.m b/core/getTriangle.m
diff --git a/core/import_audio_files.m b/core/import_audio_files.m
diff --git a/core/instructions.m b/core/instructions.m
diff --git a/core/introduce_observers.m b/core/introduce_observers.m
diff --git a/core/load_advisor_portraits.m b/core/load_advisor_portraits.m
diff --git a/core/load_observer_audio.m b/core/load_observer_audio.m
diff --git a/core/present_advice.m b/core/present_advice.m
diff --git a/core/present_delay.m b/core/present_delay.m
diff --git a/core/questionnaire.m b/core/questionnaire.m
diff --git a/core/resetPPA.m b/core/resetPPA.m
diff --git a/core/runTrial.m b/core/runTrial.m
diff --git a/core/set_cfg_shared.m b/core/set_cfg_shared.m
diff --git a/core/set_cfg_shared_text.m b/core/set_cfg_shared_text.m
diff --git a/core/showAdvisorPolitics.m b/core/showAdvisorPolitics.m
diff --git a/core/staircase.m b/core/staircase.m
diff --git a/core/start_psychtb.m b/core/start_psychtb.m
diff --git a/instructions/Aaron Instructions/Experiment 1 Instructions v3.pptx b/instructions/Aaron Instructions/Experiment 1 Instructions v3.pptx
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/Task_Instructions_AdvisorChoice.pptx b/instructions/Instructions AdvisorChoice 1900x1200/Task_Instructions_AdvisorChoice.pptx
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr1a.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr1a.PNG
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr1b.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr1b.PNG
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr1c.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr1c.PNG
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr2a.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr2a.PNG
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr2b.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr2b.PNG
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr3.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr3.PNG
diff --git a/instructions/Instructions AdvisorChoice 1900x1200/instr4.PNG b/instructions/Instructions AdvisorChoice 1900x1200/instr4.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600.pptx b/instructions/Instructions_AdvisorChoice_1300x600.pptx
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide1.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide1.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide1.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide1.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide10.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide10.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide10.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide10.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide11.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide11.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide11.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide11.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide12.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide12.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide12.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide12.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide13.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide13.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide13.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide13.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide2.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide2.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide2.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide2.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide3.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide3.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide3.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide3.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide4.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide4.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide4.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide4.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide5.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide5.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide5.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide5.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide6.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide6.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide6.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide6.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide7.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide7.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide7.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide7.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide8.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide8.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide8.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide8.TIF
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide9.PNG b/instructions/Instructions_AdvisorChoice_1300x600/Slide9.PNG
diff --git a/instructions/Instructions_AdvisorChoice_1300x600/Slide9.TIF b/instructions/Instructions_AdvisorChoice_1300x600/Slide9.TIF
diff --git a/... instructions/Task_Instructions_02 (Niccolò Pescetelli's conflicted copy 2014-11-05).pptx b/... instructions/Task_Instructions_02 (Niccolò Pescetelli's conflicted copy 2014-11-05).pptx
diff --git a/instructions/Niccolo instructions/Task_Instructions_02.pptx b/instructions/Niccolo instructions/Task_Instructions_02.pptx
diff --git a/instructions/Niccolo instructions/instr1a.PNG b/instructions/Niccolo instructions/instr1a.PNG
diff --git a/instructions/Niccolo instructions/instr1b.PNG b/instructions/Niccolo instructions/instr1b.PNG
diff --git a/instructions/Niccolo instructions/instr1c.PNG b/instructions/Niccolo instructions/instr1c.PNG
diff --git a/...colo instructions/instr2a (Niccolò Pescetelli's conflicted copy 2014-11-05).PNG b/...colo instructions/instr2a (Niccolò Pescetelli's conflicted copy 2014-11-05).PNG
diff --git a/instructions/Niccolo instructions/instr2a.PNG b/instructions/Niccolo instructions/instr2a.PNG
diff --git a/...colo instructions/instr2b (Niccolò Pescetelli's conflicted copy 2014-11-05).PNG b/...colo instructions/instr2b (Niccolò Pescetelli's conflicted copy 2014-11-05).PNG
diff --git a/instructions/Niccolo instructions/instr2b.PNG b/instructions/Niccolo instructions/instr2b.PNG
diff --git a/instructions/Niccolo instructions/instr3.PNG b/instructions/Niccolo instructions/instr3.PNG
diff --git a/instructions/Niccolo instructions/instr3f.PNG b/instructions/Niccolo instructions/instr3f.PNG
diff --git a/instructions/Niccolo instructions/instr4.PNG b/instructions/Niccolo instructions/instr4.PNG
diff --git a/instructions/SECS/AdvisorIntro1.png b/instructions/SECS/AdvisorIntro1.png
diff --git a/instructions/SECS/AdvisorIntro2.png b/instructions/SECS/AdvisorIntro2.png
diff --git a/instructions/SECS/AdvisorPolitics.png b/instructions/SECS/AdvisorPolitics.png
diff --git a/instructions/SECS/AdvisorPortraits.png b/instructions/SECS/AdvisorPortraits.png
diff --git a/instructions/SECS/DotIntro.PNG b/instructions/SECS/DotIntro.PNG
diff --git a/instructions/SECS/Instructions_SECS_1300x600.pptx b/instructions/SECS/Instructions_SECS_1300x600.pptx
diff --git a/instructions/SECS/Slide1.PNG b/instructions/SECS/Slide1.PNG
diff --git a/instructions/SECS/Slide2.PNG b/instructions/SECS/Slide2.PNG
diff --git a/instructions/Slide1.PNG b/instructions/Slide1.PNG
diff --git a/instructions/Slide10.PNG b/instructions/Slide10.PNG
diff --git a/instructions/Slide11.PNG b/instructions/Slide11.PNG
diff --git a/instructions/Slide12.PNG b/instructions/Slide12.PNG
diff --git a/instructions/Slide13.PNG b/instructions/Slide13.PNG
diff --git a/instructions/Slide14.PNG b/instructions/Slide14.PNG
diff --git a/instructions/Slide15.PNG b/instructions/Slide15.PNG
diff --git a/instructions/Slide16.PNG b/instructions/Slide16.PNG
diff --git a/instructions/Slide2.PNG b/instructions/Slide2.PNG
diff --git a/instructions/Slide3.PNG b/instructions/Slide3.PNG
diff --git a/instructions/Slide4.PNG b/instructions/Slide4.PNG
diff --git a/instructions/Slide5.PNG b/instructions/Slide5.PNG
diff --git a/instructions/Slide6.PNG b/instructions/Slide6.PNG
diff --git a/instructions/Slide7.PNG b/instructions/Slide7.PNG
diff --git a/instructions/Slide8.PNG b/instructions/Slide8.PNG
diff --git a/instructions/Slide9.PNG b/instructions/Slide9.PNG
diff --git a/killPTB.m b/killPTB.m
diff --git a/launcher.m b/launcher.m
@@ -13,11 +13,12 @@
 %experimentName = 'HaloEffect';
 %experimentName = 'AdvisorChoice';
 experimentName = 'PoliticalDifferences';
-forceResolution = [1300 600];
+forceResolution = [];
+%forceResolution = [1300 600];
 feedbackEnabled = 0; 
 debugMode = 1;
 shortMode = 1;
-pathRoot = 'MattHome';
+pathRoot = 'AlexLaptop';
 
 %% set path   
 switch pathRoot
@@ -42,6 +43,14 @@
         stims_path    = [my_path 'stims']; 
         osSlash = '\';
         screenNumber = 1;
+
+    case 'AlexLaptop'
+        my_path = '/Users/Alex/Documents/MATLAB/Research Project/';
+        results_path = ['/Users/Alex/Documents/MATLAB/Research Project/Results/' experimentName];
+        stims_path = [my_path 'stims'];
+        osSlash = '/';
+        screenNumber = 0;
+        Screen('Preference', 'SkipSyncTests', 1);
 end
 
 warning('off','MATLAB:rmpath:DirNotFound')
@@ -55,5 +64,5 @@
 stim_folder = [osSlash 'sounds' osSlash 'Voice'];
 
 cd(my_path)
-screenTests
-%main
+%screenTests
+main
diff --git a/stims/generalKnowledgeQuestions.xml b/stims/generalKnowledgeQuestions.xml
diff --git a/stims/observer1.jpg b/stims/observer1.jpg
diff --git a/stims/observer2.jpg b/stims/observer2.jpg
diff --git a/stims/observer3.jpg b/stims/observer3.jpg
diff --git a/stims/observer4.jpg b/stims/observer4.jpg
diff --git a/stims/silouette.jpg b/stims/silouette.jpg
diff --git a/stims/sounds/Voice1/111.wav b/stims/sounds/Voice1/111.wav
diff --git a/stims/sounds/Voice1/112.wav b/stims/sounds/Voice1/112.wav
diff --git a/stims/sounds/Voice1/121.wav b/stims/sounds/Voice1/121.wav
diff --git a/stims/sounds/Voice1/122.wav b/stims/sounds/Voice1/122.wav
diff --git a/stims/sounds/Voice1/211.wav b/stims/sounds/Voice1/211.wav
diff --git a/stims/sounds/Voice1/212.wav b/stims/sounds/Voice1/212.wav
diff --git a/stims/sounds/Voice1/221.wav b/stims/sounds/Voice1/221.wav
diff --git a/stims/sounds/Voice1/222.wav b/stims/sounds/Voice1/222.wav
diff --git a/stims/sounds/Voice1/introduction.wav b/stims/sounds/Voice1/introduction.wav
diff --git a/stims/sounds/Voice1/original recording/ZOOM0011_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0011_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0012_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0012_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0013_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0013_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0014_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0014_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0015_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0015_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0016_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0016_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0017_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0017_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0018_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0018_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0019_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0019_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0020_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0020_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0021_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0021_del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0022_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0022_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0023_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0023_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0024_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0024_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0025.MP3 b/stims/sounds/Voice1/original recording/ZOOM0025.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0026_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0026_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0027del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0027del.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0028_sel.MP3 b/stims/sounds/Voice1/original recording/ZOOM0028_sel.MP3
diff --git a/stims/sounds/Voice1/original recording/ZOOM0029_del.MP3 b/stims/sounds/Voice1/original recording/ZOOM0029_del.MP3
diff --git a/stims/sounds/Voice2/111.wav b/stims/sounds/Voice2/111.wav
diff --git a/stims/sounds/Voice2/112.wav b/stims/sounds/Voice2/112.wav
diff --git a/stims/sounds/Voice2/121.wav b/stims/sounds/Voice2/121.wav
diff --git a/stims/sounds/Voice2/122.wav b/stims/sounds/Voice2/122.wav
diff --git a/stims/sounds/Voice2/211.wav b/stims/sounds/Voice2/211.wav
diff --git a/stims/sounds/Voice2/212.wav b/stims/sounds/Voice2/212.wav
diff --git a/stims/sounds/Voice2/221.wav b/stims/sounds/Voice2/221.wav
diff --git a/stims/sounds/Voice2/222.wav b/stims/sounds/Voice2/222.wav
diff --git a/stims/sounds/Voice2/introduction.wav b/stims/sounds/Voice2/introduction.wav
diff --git a/stims/sounds/Voice2/original recording/ZOOM0011_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0011_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0012_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0012_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0013_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0013_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0014_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0014_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0015_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0015_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0016_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0016_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0017_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0017_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0018_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0018_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0019_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0019_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0020_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0020_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0021_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0021_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0022_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0022_del.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0023_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0023_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0024_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0024_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0025_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0025_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0026_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0026_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0027_sel.MP3 b/stims/sounds/Voice2/original recording/ZOOM0027_sel.MP3
diff --git a/stims/sounds/Voice2/original recording/ZOOM0028_del.MP3 b/stims/sounds/Voice2/original recording/ZOOM0028_del.MP3
diff --git a/stims/sounds/Voice3/111.wav b/stims/sounds/Voice3/111.wav
diff --git a/stims/sounds/Voice3/112.wav b/stims/sounds/Voice3/112.wav
diff --git a/stims/sounds/Voice3/121.wav b/stims/sounds/Voice3/121.wav
diff --git a/stims/sounds/Voice3/122.wav b/stims/sounds/Voice3/122.wav
diff --git a/stims/sounds/Voice3/211.wav b/stims/sounds/Voice3/211.wav
diff --git a/stims/sounds/Voice3/212.wav b/stims/sounds/Voice3/212.wav
diff --git a/stims/sounds/Voice3/221.wav b/stims/sounds/Voice3/221.wav
diff --git a/stims/sounds/Voice3/222.wav b/stims/sounds/Voice3/222.wav
diff --git a/stims/sounds/Voice3/introduction.wav b/stims/sounds/Voice3/introduction.wav
diff --git a/stims/sounds/Voice3/original recording/ZOOM0029_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0029_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0030_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0030_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0031_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0031_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0032_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0032_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0033_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0033_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0034_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0034_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0035_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0035_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0036_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0036_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0037_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0037_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0038_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0038_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0039_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0039_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0040_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0040_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0041_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0041_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0042_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0042_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0043_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0043_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0044_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0044_sel.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0045_del.MP3 b/stims/sounds/Voice3/original recording/ZOOM0045_del.MP3
diff --git a/stims/sounds/Voice3/original recording/ZOOM0046_sel.MP3 b/stims/sounds/Voice3/original recording/ZOOM0046_sel.MP3
diff --git a/stims/sounds/Voice4/111.wav b/stims/sounds/Voice4/111.wav
diff --git a/stims/sounds/Voice4/112.wav b/stims/sounds/Voice4/112.wav
diff --git a/stims/sounds/Voice4/121.wav b/stims/sounds/Voice4/121.wav
diff --git a/stims/sounds/Voice4/122.wav b/stims/sounds/Voice4/122.wav
diff --git a/stims/sounds/Voice4/211.wav b/stims/sounds/Voice4/211.wav
diff --git a/stims/sounds/Voice4/212.wav b/stims/sounds/Voice4/212.wav
diff --git a/stims/sounds/Voice4/221.wav b/stims/sounds/Voice4/221.wav
diff --git a/stims/sounds/Voice4/222.wav b/stims/sounds/Voice4/222.wav
diff --git a/stims/sounds/Voice4/introduction.wav b/stims/sounds/Voice4/introduction.wav
diff --git a/stims/sounds/Voice4/introduction_annie.wav b/stims/sounds/Voice4/introduction_annie.wav
diff --git a/stims/sounds/Voice4/introduction_bea.wav b/stims/sounds/Voice4/introduction_bea.wav
diff --git a/stims/sounds/Voice4/introduction_cate.wav b/stims/sounds/Voice4/introduction_cate.wav
diff --git a/stims/sounds/Voice4/introduction_sarah.wav b/stims/sounds/Voice4/introduction_sarah.wav
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0028_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0028_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0029_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0029_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0030_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0030_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0031_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0031_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0032_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0032_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0033_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0033_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0034_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0034_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0035_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0035_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0036_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0036_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0037_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0037_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0038_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0038_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0039_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0039_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0040_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0040_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0041_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0041_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0042_sel.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0042_sel.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0043_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0043_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0044_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0044_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0045_del.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0045_del.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0046_annie.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0046_annie.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0047_bea.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0047_bea.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0048_cate.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0048_cate.MP3
diff --git a/stims/sounds/Voice4/original recordings/ZOOM0049_debbie.MP3 b/stims/sounds/Voice4/original recordings/ZOOM0049_debbie.MP3
diff --git a/stims/sounds/Voice5/111.wav b/stims/sounds/Voice5/111.wav
diff --git a/stims/sounds/Voice5/112.wav b/stims/sounds/Voice5/112.wav
diff --git a/stims/sounds/Voice5/121.wav b/stims/sounds/Voice5/121.wav
diff --git a/stims/sounds/Voice5/122.wav b/stims/sounds/Voice5/122.wav
diff --git a/stims/sounds/Voice5/211.wav b/stims/sounds/Voice5/211.wav
diff --git a/stims/sounds/Voice5/212.wav b/stims/sounds/Voice5/212.wav
diff --git a/stims/sounds/Voice5/221.wav b/stims/sounds/Voice5/221.wav
diff --git a/stims/sounds/Voice5/222.wav b/stims/sounds/Voice5/222.wav
diff --git a/stims/sounds/Voice5/introduction.wav b/stims/sounds/Voice5/introduction.wav