From 670bdce63c784fb4a5c667f556ff860547c14559 Mon Sep 17 00:00:00 2001
From: Michael Tan <mtan30@uic.edu>
Date: Thu, 9 Jan 2020 13:33:24 -0600
Subject: [PATCH] Fixes for file length and controller-only instruction
 control.

---
 .gitignore                                      |   1 +
 EyeLinkCoreGraphicsPsychoPy.py                  |   0
 Images/face2nS_11-160.tif                       | Bin
 Images/house4n_11-160.tif                       | Bin
 SaccadePursuit.py                               |   0
 SaccadePursuitEyeTracking.py                    |  13 +++++++------
 __pycache__/SaccadePursuit.cpython-36.pyc       | Bin 11958 -> 0 bytes
 .../SaccadePursuitEyeTracking.cpython-36.pyc    | Bin 12213 -> 0 bytes
 eyelinker.py                                    |   6 +++---
 template.py                                     |  10 ++++++----
 10 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore
 mode change 100755 => 100644 EyeLinkCoreGraphicsPsychoPy.py
 mode change 100755 => 100644 Images/face2nS_11-160.tif
 mode change 100755 => 100644 Images/house4n_11-160.tif
 mode change 100755 => 100644 SaccadePursuit.py
 mode change 100755 => 100644 SaccadePursuitEyeTracking.py
 delete mode 100644 __pycache__/SaccadePursuit.cpython-36.pyc
 delete mode 100644 __pycache__/SaccadePursuitEyeTracking.cpython-36.pyc
 mode change 100755 => 100644 eyelinker.py
 mode change 100755 => 100644 template.py

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bee8a64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/EyeLinkCoreGraphicsPsychoPy.py b/EyeLinkCoreGraphicsPsychoPy.py
old mode 100755
new mode 100644
diff --git a/Images/face2nS_11-160.tif b/Images/face2nS_11-160.tif
old mode 100755
new mode 100644
diff --git a/Images/house4n_11-160.tif b/Images/house4n_11-160.tif
old mode 100755
new mode 100644
diff --git a/SaccadePursuit.py b/SaccadePursuit.py
old mode 100755
new mode 100644
diff --git a/SaccadePursuitEyeTracking.py b/SaccadePursuitEyeTracking.py
old mode 100755
new mode 100644
index 47d5417..12c7746
--- a/SaccadePursuitEyeTracking.py
+++ b/SaccadePursuitEyeTracking.py
@@ -31,7 +31,7 @@ distance_to_monitor = 74
 monitor_px = [1440,900]
 window_screen = 1
 
-disableTracker = False # For Debugging
+disableTracker = True # For Debugging
 isi_time = 2 # Interstimulus Interval
 data_directory = os.path.join(
     os.path.expanduser('~'), 'Desktop', 'ExperimentalData', 'SaccadePursuitEyeTracking')
@@ -59,7 +59,7 @@ pursuit_time = [40,20,15]
 
 # Necker Cube Parameters
 number_of_necker_trials = 1
-number_of_necker_blocks = 4
+number_of_necker_blocks = 3
 necker_time = 60
 necker_color = [190,190,190]
 necker_bg_color = [30,30,30]
@@ -302,9 +302,11 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask):
             )
             self.tracker.initialize_graphics()
             self.tracker.open_edf()
-            self.tracker.send_command("add_file_preamble_text 'Saccade Pursuit Experiment Plus Fixation and Necker Cube'")
+            #self.tracker.send_command("add_file_preamble_text 'Saccade Pursuit Experiment Plus Fixation and Necker Cube'")
             self.tracker.initialize_tracker()
-            self.tracker.send_calibration_settings()
+            self.tracker.send_calibration_settings(
+                settings={'preamble_text':'Saccade Pursuit Experiment Plus Fixation and Necker Cube',}
+                )
 
         for instruction in self.instruct_text:
             self.display_text_screen(text=instruction)
@@ -312,6 +314,7 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask):
         if not self.disableTracker:
             self.tracker.display_eyetracking_instructions()
             self.tracker.setup_tracker()
+            self.tracker.send_command("track_search_limits=NO")
         
         #random.shuffle(conditions)
 
@@ -355,8 +358,6 @@ class EyeTrackingSaccadePursuit(SaccadePursuit.SPtask):
 
             for block_num in range(numBlocks):
                 block = self.make_block(condition, numTrials)
-                if not self.disableTracker:
-                    self.tracker.drift_correct()
                 self.display_text_screen(text='Get ready...', wait_for_input=False)
                 psychopy.core.wait(2)
                 if condition == 'Saccade' or condition == 'AntiSaccade':
diff --git a/__pycache__/SaccadePursuit.cpython-36.pyc b/__pycache__/SaccadePursuit.cpython-36.pyc
deleted file mode 100644
index a5b3657b06cc459cea53b4861bb4a7b04a1826d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11958
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

diff --git a/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc b/__pycache__/SaccadePursuitEyeTracking.cpython-36.pyc
deleted file mode 100644
index 24ce41610b3d11dc00ebeb3ddba5ba1758e485a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12213
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
F{TCn_lkfll

diff --git a/eyelinker.py b/eyelinker.py
old mode 100755
new mode 100644
index fe04003..02d4ba7
--- a/eyelinker.py
+++ b/eyelinker.py
@@ -212,9 +212,9 @@ class EyeLinker(object):
         try:
             self.tracker.doDriftCorrect(position[0], position[1], 1, setup)
             self.tracker.applyDriftCorrect()
-        except:# RuntimeError as e:
-            #print(e.message)
-            self.tracker.doTrackerSetup()
+        except RuntimeError as e:
+            print(e.message)
+            #self.tracker.doTrackerSetup()
 
     def record(self, trial_func):
         def wrapped_func():
diff --git a/template.py b/template.py
old mode 100755
new mode 100644
index f492ecd..f44439a
--- a/template.py
+++ b/template.py
@@ -167,8 +167,8 @@ class BaseExperiment(object):
         """
 
         if filename is None:
-            filename = (self.experiment_name + 
-                        self.experiment_info['Subject Identifier'].zfill(3) +
+            filename = (self.experiment_name + '_' + 
+                        self.experiment_info['Subject Identifier'] +
                         '_info')
         elif filename[-4:] == '.txt':
             filename = filename[:-4]
@@ -201,8 +201,8 @@ class BaseExperiment(object):
         """
 
         if data_filename is None:
-            data_filename = (self.experiment_name + 
-            self.experiment_info['Subject Identifier'].zfill(3))
+            data_filename = (self.experiment_name + '_' + 
+            self.experiment_info['Subject Identifier'])
         elif data_filename[-4:] == '.csv':
             data_filename = data_filename[:-4]
 
@@ -379,6 +379,8 @@ class BaseExperiment(object):
         if wait_for_input:
             psychopy.core.wait(.2)  # Prevents accidental key presses
             keys = psychopy.event.waitKeys()
+            while keys != ['space']:
+                keys = psychopy.event.waitKeys()
             self.experiment_window.flip()
 
         return keys