Merge pull request #5 from CognitiveNeuroLab/final

minor update:
minor aesthetic changes
presenting instructions longer

src/Presentation/swat_cys_1-practice.sce

@@ -83,17 +83,17 @@ trial{ #this is the first screen to prepare people
    trial_type = specific_response;  # button is pressed
    terminator_button = 1;   # left-Ctrl
    picture {
-		text {caption ="Please double click to start"; font_size = 65;};
+		text {caption ="Please double click to start"; font_size = 30;};
       x=0;y=0;};
 }start_trial;
 
 trial{ # the first stim is too quick if there is no delay. This trial puts 2sec between the start and the stim
-	trial_duration = 5000; 
+	trial_duration = 12000; 
 	stimulus_event {
 	picture {
-		text {caption ="If the text is red, click for a Vowel \n \n If the text is green, click when the number is even"; font_size = 20;};
+		text {caption ="If the text is red, click for vowels \n \n If the text is green, click for even numbers"; font_size = 30;};
       x=0;y=0;};
-		duration = 3000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
+		duration = 10000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
 		code = "201 start recording";  
 	#port_code = 201; #Don't want to save this in the BDF
 	}code_event;

src/Presentation/swat_cys_1.sce

@@ -82,21 +82,21 @@ trial{ #this is the first screen to prepare people
    trial_type = specific_response;  # button is pressed
    terminator_button = 1;   # left-Ctrl
    picture {
-		text {caption ="Please double click to start"; font_size = 65;};
+		text {caption ="Please double click to start"; font_size = 30;};
       x=0;y=0;};
 }start_trial;
 
 trial{ # the first stim is too quick if there is no delay. This trial puts 2sec between the start and the stim
-	trial_duration = 5000; 
+	trial_duration = 8000; 
 	stimulus_event {
 	picture {
-		text {caption ="If the text is red, click for a Vowel \n \n If the text is green, click when the number is even"; font_size = 20;};
+		text {caption ="If the text is red, click for vowels \n \n If the text is green, click for even numbers"; font_size = 30;};
       x=0;y=0;};
-		duration = 3000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
+		duration = 6000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
 	}pic_event;
 	stimulus_event {
 		picture default;
-		time=3000;		
+		time=6100;		
 		duration = 100; #so that there is a fixation cross 2 seconds before the first trial and people can focus
 		code = "201 start recording";  
 		port_code = 201; 

src/Presentation/swat_cys_2-practice.sce

@@ -86,22 +86,23 @@ trial{ #this is the first screen to prepare people
    trial_type = specific_response;  # button is pressed
    terminator_button = 1;   # left-Ctrl
    picture {
-		text {caption ="Please double click to start"; font_size = 65;};
+		text {caption ="Please double click to start"; font_size = 30;};
       x=0;y=0;};
 }start_trial;
 
 trial{ # the first stim is too quick if there is no delay. This trial puts 2sec between the start and the stim
-	trial_duration = 5000; 
+	trial_duration = 12000; 
 	stimulus_event {
 	picture {
-		text {caption ="If the text is red, click for a Vowel \n \n If the text is green, click when the number is even"; font_size = 20;};
+		text {caption ="If the text is green, click for vowels \n \n If the text is red, click for even numbers"; font_size = 30;};
       x=0;y=0;};
-		duration = 3000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
+		duration = 10000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
 		code = "201 start recording";  
 	#port_code = 201; #Don't want to save this in the BDF
 	}code_event;
 }wait_trial;
 
+
 #douwe edit
 trial{ # This is to indentify what participants are responding to
 	trial_duration = 250; #2 sec before the first stim

src/Presentation/swat_cys_2.exp

@@ -1,5 +1,5 @@
 <ver>20.1</ver>
-<efn>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys_2.exp</efn>
+<efn>E:\final_swat_pres\swat_cys_2.exp</efn>
 <author>cystinosis update: Douwe</author>
 <con>
 <pause>P</pause>
@@ -43,10 +43,10 @@
 <dsd>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Stimuli</dsd>
 <dxv>8</dxv>
 <efs>
-<filename>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys_2.sce</filename>
-<filename>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys_2-practice.sce</filename>
-<filename>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys_practice.pcl</filename>
-<filename>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys.pcl</filename>
+<filename>E:\final_swat_pres\swat_cys_2.sce</filename>
+<filename>E:\final_swat_pres\swat_cys_2-practice.sce</filename>
+<filename>E:\final_swat_pres\swat_cys_practice.pcl</filename>
+<filename>E:\final_swat_pres\swat_cys.pcl</filename>
 </efs>
 <exclusive_mouse>1</exclusive_mouse>
 <exp_version>V2</exp_version>
@@ -173,9 +173,9 @@
 <il>0</il>
 <ivm>0</ivm>
 <mtype>dig</mtype>
-<piai>LPT1</piai>
+<piai>LPT3</piai>
 <pian>Parallel Port</pian>
-<pihpn>LPT1</pihpn>
+<pihpn>LPT3</pihpn>
 <pindex>1</pindex>
 <rs>1</rs>
 <rt>0</rt>
@@ -303,6 +303,25 @@
 <dead_zone>0</dead_zone>
 <max>1000</max>
 <min>-1000</min>
+<name>X Axis</name>
+<saturation>1</saturation>
+</axis>
+<axis>
+<dead_zone>0</dead_zone>
+<max>1000</max>
+<min>-1000</min>
+<name>Y Axis</name>
+<saturation>1</saturation>
+</axis>
+<device_type>1</device_type>
+<dx_device_type>20</dx_device_type>
+<name>WingMan Precision USB</name>
+</device>
+<device>
+<axis>
+<dead_zone>0</dead_zone>
+<max>1000</max>
+<min>-1000</min>
 <name>X-axis</name>
 <saturation>1</saturation>
 </axis>
@@ -469,7 +488,7 @@
 <offset>12</offset>
 </idv>
 <overrides></overrides>
-<sfn>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys_2.sce</sfn>
+<sfn>E:\final_swat_pres\swat_cys_2.sce</sfn>
 </sce>
 <sce>
 <idv>
@@ -482,7 +501,7 @@
 <offset>12</offset>
 </idv>
 <overrides></overrides>
-<sfn>C:\Users\Presentation\Desktop\Active Projects\swat_cystinosis\Presentation\swat_cys_2-practice.sce</sfn>
+<sfn>E:\final_swat_pres\swat_cys_2-practice.sce</sfn>
 </sce>
 <sct>
 <capture_device>
@@ -558,7 +577,7 @@
 <vt>0</vt>
 </trigger_mode>
 <udt>0</udt>
-<ulo>Collected in KL</ulo>
+<ulo>Collected in AR</ulo>
 <unc>1</unc>
 <upb>1</upb>
 <urp>0</urp>

src/Presentation/swat_cys_2.sce

@@ -85,27 +85,28 @@ trial{ #this is the first screen to prepare people
    trial_type = specific_response;  # button is pressed
    terminator_button = 1;   # left-Ctrl
    picture {
-		text {caption ="Please double click to start"; font_size = 65;};
+		text {caption ="Please double click to start"; font_size = 30;};
       x=0;y=0;};
 }start_trial;
 
-trial{
-	trial_duration = 5000; 
+trial{ # the first stim is too quick if there is no delay. This trial puts 2sec between the start and the stim
+	trial_duration = 8000; 
 	stimulus_event {
-		picture {
-		text {caption ="If the text is red click when the number is even,  \n \n If the text is green, click for a Vowel"; font_size = 20;};
-            x=0;y=0;};
-		duration = 3000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
+	picture {
+		text {caption ="If the text is green, click for vowels \n \n If the text is red, click for even numbers"; font_size = 30;};
+      x=0;y=0;};
+		duration = 6000; #so that there is a fixation cross 2 seconds before the first trial and people can focus
 	}pic_event;
 	stimulus_event {
 		picture default;
-		time=3000;		
+		time=6100;		
 		duration = 100; #so that there is a fixation cross 2 seconds before the first trial and people can focus
 		code = "201 start recording";  
 		port_code = 201; 
 	}code_event;
 }wait_trial;
 
+
 #douwe edit
 trial{ # This is to indentify what participants are responding to
 	trial_duration = 250; #2 sec before the first stim