MultiTaskBattery 1.3.0__tar.gz → 1.3.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/__init__.py +1 -1
  2. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/experiment_block.py +7 -4
  3. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/screen.py +2 -4
  4. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery.egg-info/PKG-INFO +1 -1
  5. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/PKG-INFO +1 -1
  6. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/LICENSE +0 -0
  7. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/battery.py +0 -0
  8. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/fetch.py +0 -0
  9. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/task_blocks.py +0 -0
  10. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/task_details.json +0 -0
  11. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/task_file.py +0 -0
  12. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/task_table.tsv +0 -0
  13. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/ttl_clock.py +0 -0
  14. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery/utils.py +0 -0
  15. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery.egg-info/SOURCES.txt +0 -0
  16. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery.egg-info/dependency_links.txt +0 -0
  17. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery.egg-info/entry_points.txt +0 -0
  18. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery.egg-info/requires.txt +0 -0
  19. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/MultiTaskBattery.egg-info/top_level.txt +0 -0
  20. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/README.md +0 -0
  21. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/pyproject.toml +0 -0
  22. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/setup.cfg +0 -0
  23. {multitaskbattery-1.3.0 → multitaskbattery-1.3.1}/tests/test_tasks.py +0 -0
@@ -1,4 +1,4 @@
1
1
  """MultiTaskBattery: a toolbox for running multi-domain cognitive and motor
2
2
  tasks during fMRI sessions, built on PsychoPy."""
3
3
 
4
- __version__ = "1.3.0"
4
+ __version__ = "1.3.1"
@@ -49,8 +49,11 @@ class Experiment:
49
49
  pass
50
50
  event.globalKeys.add(key=quit_key, func=self.quit, name='quit')
51
51
 
52
+ # eye tracking is optional: set eye_tracker = True in constants.py to enable (default False)
53
+ self.eye_tracker = getattr(const, 'eye_tracker', False)
54
+
52
55
  # connect to the eyetracker already
53
- if self.const.eye_tracker:
56
+ if self.eye_tracker:
54
57
  import pylink as pl
55
58
  self.pl = pl # keep a handle so run() can call pylink (optional import, only when eye_tracker=True)
56
59
  # create an Eyelink class
@@ -153,7 +156,7 @@ class Experiment:
153
156
  run_end_timestamp = None
154
157
 
155
158
  # Start the eyetracker
156
- if self.const.eye_tracker:
159
+ if self.eye_tracker:
157
160
  self.start_eyetracker()
158
161
 
159
162
  for t_num, task in enumerate(self.task_obj_list):
@@ -170,7 +173,7 @@ class Experiment:
170
173
  r_data['real_start_time'],r_data['start_ttl'],r_data['start_ttl_time'] = self.ttl_clock.wait_until(r_data.start_time)
171
174
 
172
175
  ## sending a message to the edf file specifying task name
173
- if self.const.eye_tracker:
176
+ if self.eye_tracker:
174
177
  self.pl.sendMessageToFile(f"task_name: {task.name} start_track: {self.pl.currentUsec()} real start time {r_data.real_start_time} TR count {self.ttl_clock.ttl_count}")
175
178
 
176
179
  # display the instruction text for the task. (instructions are task specific)
@@ -212,7 +215,7 @@ class Experiment:
212
215
  self.ttl_clock.wait_until(r_data.end_time)
213
216
 
214
217
  # Stop the eyetracker
215
- if self.const.eye_tracker:
218
+ if self.eye_tracker:
216
219
  self.stop_eyetracker()
217
220
  self.tk.receiveDataFile(self.tk_filename, self.tk_filename)
218
221
 
@@ -53,10 +53,8 @@ class Screen:
53
53
  screens = display.get_screens()
54
54
 
55
55
  if self.fullscr and len(screens) <= 1:
56
- print("Warning: Fullscreen mode is enabled, but you have no external monitor connected.")
57
- print("Change the constants to not use fullscreen mode or connect an external monitor.")
58
- print("Quitting the experiment to avoid a frozen screen....")
59
- exit(1)
56
+ print("Warning: Fullscreen mode is enabled with only one screen connected.")
57
+ print("The experiment will cover this screen; press Esc to quit it.")
60
58
 
61
59
 
62
60
  def start_screen(self, color='white', height=None, wrap_width=None):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: MultiTaskBattery
3
- Version: 1.3.0
3
+ Version: 1.3.1
4
4
  Summary: A flexible Python toolbox for running multi-domain cognitive and motor tasks during fMRI sessions, built on PsychoPy.
5
5
  Author: Diedrichsenlab
6
6
  License-Expression: MIT
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: MultiTaskBattery
3
- Version: 1.3.0
3
+ Version: 1.3.1
4
4
  Summary: A flexible Python toolbox for running multi-domain cognitive and motor tasks during fMRI sessions, built on PsychoPy.
5
5
  Author: Diedrichsenlab
6
6
  License-Expression: MIT