From 9cbdb950a4977cb4fa1509a3f8fbe963461fe25e Mon Sep 17 00:00:00 2001
From: Michael Tan <mtan30@uic.edu>
Date: Fri, 18 Oct 2019 12:56:33 -0500
Subject: [PATCH] Changing Saccade and Pursuit protocols to have a break
 between each stimulus or frequency.  -MT

---
 SaccadePursuit.py                             |   7 +++--
 SaccadePursuitEyeTracking.py                  |  28 ++++++++++--------
 .../SaccadePursuitEyeTracking.cpython-36.pyc  | Bin 0 -> 9148 bytes
 3 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 __pycache__/SaccadePursuitEyeTracking.cpython-36.pyc

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 0000000000000000000000000000000000000000..6929cb8825df8fbd013f05cb73b28a3fe8d326de
GIT binary patch
literal 9148
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
E061mOQ~&?~

literal 0
HcmV?d00001