diff --git a/SaccadePursuit.py b/SaccadePursuit.py index 8e66c13..bbfbe9d 100755 --- a/SaccadePursuit.py +++ b/SaccadePursuit.py @@ -154,8 +154,9 @@ class SPtask(template.BaseExperiment): counter = 0 for num_trials in range(numTrials): if condition == 'Pursuit': - trial = self.make_trial(self.pursuit_time, self.pursuit_frequencies, condition) - trial_list.append(trial) + for freq in self.pursuit_frequencies: + trial = self.make_trial(self.pursuit_time, freq, condition) + trial_list.append(trial) elif condition == 'Necker': trial = self.make_trial(self.necker_time, 1, condition) trial_list.append(trial) @@ -303,6 +304,8 @@ class SPtask(template.BaseExperiment): Xposition = [0] num_frames_per_second = 60 counter = 0 + if not isinstance(stim_frequency, list): + stim_frequency = [stim_frequency] for freq in stim_frequency: stim_frames = int(round(stim_time[counter]*num_frames_per_second)) for time in range(stim_frames): diff --git a/SaccadePursuitEyeTracking.py b/SaccadePursuitEyeTracking.py index 26dcfa1..df9d73f 100755 --- a/SaccadePursuitEyeTracking.py +++ b/SaccadePursuitEyeTracking.py @@ -26,15 +26,15 @@ import SaccadePursuit # Experimental Parameters monitor_name = 'testMonitor' -monitor_width = 41 +monitor_width = 59.5 #41 distance_to_monitor = 70 -monitor_px = [1440,900] -window_screen = 1 +monitor_px = [2560,1440] #[1440,900] +window_screen = 0 #1 -disableTracker = False # For Debugging -conditions = ['Fixation', 'Pursuit', 'Saccade', 'AntiSaccade', 'Necker', 'Rivalry'] -#conditions = ['Saccade'] +disableTracker = True # For Debugging +#conditions = ['Fixation', 'Pursuit', 'Saccade', 'AntiSaccade', 'Necker'] #, 'Rivalry'] +conditions = ['Pursuit'] isi_time = 1 # Interstimulus Interval data_directory = os.path.join( os.path.expanduser('~'), 'Desktop', 'ExperimentalData', 'SaccadePursuitEyeTracking') @@ -47,20 +47,20 @@ saccade_distance = 15 #15 saccade_time = 3 #3 stimulus_size = 0.3 stim_color = [1,-1,-1] -saccade_fixation_color = [1,1,1] +saccade_fixation_color = [.5,.5,.5] # Pursuit Parameters number_of_pursuit_trials = 1 number_of_pursuit_blocks = 1 pursuit_distance = 15 pursuit_frequencies = [0.1,0.2,0.4] -pursuit_time = [40,20,15] +pursuit_time = [5,5,5] #[40,20,15] # Necker Cube Parameters number_of_necker_trials = 1 -number_of_necker_blocks = 1 -necker_time = 90 -necker_color = [255,255,255] +number_of_necker_blocks = 4 +necker_time = 60 +necker_color = [191,191,191] necker_bg_color = [-0.5,-0.5,-0.5] necker_scale = 0.5 necker_file = os.path.join(image_directory,'Necker1.tif') @@ -78,7 +78,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 = [1,1,1] +rivalry_border_color = [0.5,0.5,0.5] rivalry_border_width = 5 rivalry_distance = 4 @@ -296,7 +296,9 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask): data = self.run_trial(trial, block_num, trial_num) data.update({'Condition': condition}) self.send_data(data) - if not condition == 'Saccade' and not condition=='AntiSaccade': + if condition == 'Saccade' or condition=='AntiSaccade': + self.display_saccade_fixation(self.isi_time) + else: self.display_fixation(self.isi_time) if condition == 'Saccade' or condition == 'AntiSaccade': diff --git a/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc b/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc new file mode 100644 index 0000000..6929cb8 Binary files /dev/null and b/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc differ