diff --git a/Images/ResponseBox4.tif b/Images/ResponseBox4.tif new file mode 100644 index 0000000..2290155 Binary files /dev/null and b/Images/ResponseBox4.tif differ diff --git a/Images/ResponseBox4.xcf b/Images/ResponseBox4.xcf new file mode 100644 index 0000000..b284fdc Binary files /dev/null and b/Images/ResponseBox4.xcf differ diff --git a/Images/ResponseBox5.tif b/Images/ResponseBox5.tif new file mode 100644 index 0000000..198cebd Binary files /dev/null and b/Images/ResponseBox5.tif differ diff --git a/SaccadePursuit.py b/SaccadePursuit.py index 248dfba..4c70994 100755 --- a/SaccadePursuit.py +++ b/SaccadePursuit.py @@ -27,6 +27,7 @@ import psychopy.core import psychopy.event import psychopy.visual import psychopy.hardware.joystick +import psychopy.sound import psychopy # noqa:F401 import eyelinker @@ -88,8 +89,11 @@ class SPtask(template.BaseExperiment): fixation_trial_time, rivalry_time, rivalry_scale,rivalry_border_color, rivalry_border_width, rivalry_distance, + new_trial_sound, questionaire_dict=questionaire_dict, **kwargs): + self.new_trial_sound = new_trial_sound + # Pursuit self.pursuit_time = pursuit_time self.pursuit_distance = pursuit_distance @@ -448,8 +452,10 @@ class SPtask(template.BaseExperiment): self.display_fixation(trial['trial_time']) elif trial['trial_type']=='Rivalry': freq = self.display_rivalry(trial['trial_time'], tracker) + psychopy.sound.Sound(self.new_trial_sound).play() else: self.display_saccade(trial['locations'], trial['trial_time']) + psychopy.sound.Sound(self.new_trial_sound).play() data = { 'Subject': self.experiment_info['Subject Identifier'], diff --git a/SaccadePursuitEyeTracking.py b/SaccadePursuitEyeTracking.py index 71cd300..171d570 100755 --- a/SaccadePursuitEyeTracking.py +++ b/SaccadePursuitEyeTracking.py @@ -27,18 +27,18 @@ import SaccadePursuit # Experimental Parameters monitor_name = 'testMonitor' monitor_width = 59.5 #41 -distance_to_monitor = 70 +distance_to_monitor = 80 monitor_px = [2560,1440] #[1440,900] window_screen = 0 #1 - disableTracker = True # For Debugging -#conditions = ['Fixation', 'Pursuit', 'Saccade', 'AntiSaccade', 'Necker'] #, 'Rivalry'] -conditions = ['Necker'] +conditions = ['Fixation', 'Pursuit', 'Saccade', 'AntiSaccade', 'Necker'] #, 'Rivalry'] +#conditions = ['Saccade'] isi_time = 1 # Interstimulus Interval data_directory = os.path.join( os.path.expanduser('~'), 'Desktop', 'ExperimentalData', 'SaccadePursuitEyeTracking') image_directory = os.path.join(os.getcwd(),'Images') +new_trial_sound = 'A' # Saccade / Antisaccade Parameters number_of_saccade_trials = 1 @@ -47,7 +47,7 @@ saccade_distance = 15 #15 saccade_time = 3 #3 stimulus_size = 0.3 stim_color = [1,-1,-1] -saccade_fixation_color = [191,191,191] +saccade_fixation_color = [100,100,100] # Pursuit Parameters number_of_pursuit_trials = 1 @@ -60,11 +60,11 @@ pursuit_time = [5,5,5] #[40,20,15] number_of_necker_trials = 1 number_of_necker_blocks = 4 necker_time = 6 -necker_color = [191,191,191] +necker_color = [100,100,100] necker_bg_color = [64,64,64] necker_scale = 0.5 necker_file = os.path.join(image_directory,'Necker1.tif') -response_box_file = os.path.join(image_directory,'ResponseBox3.tif') +response_box_file = os.path.join(image_directory,'ResponseBox4.tif') # Fixation Parameters number_of_fixation_trials = 1 @@ -79,7 +79,7 @@ rivalry_time = 90 rivalry_scale = 2.5 rivalry_file1 = os.path.join(image_directory,'house4n_11-160.tif') rivalry_file2 = os.path.join(image_directory,'face2nS_11-160.tif') -rivalry_border_color = [191,191,191] +rivalry_border_color = [100,100,100] rivalry_border_width = 5 rivalry_distance = 4 @@ -378,6 +378,7 @@ experiment = EyeTrackingSaccadePursuit( disableTracker=disableTracker, rivalry_border_width=rivalry_border_width, rivalry_distance=rivalry_distance, + new_trial_sound = new_trial_sound ) if __name__ == '__main__': diff --git a/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc b/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc index 3c0ea35..8f85909 100644 Binary files a/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc and b/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc differ