Refactor: simplify command line, robustify inputs

.env.tpl

@@ -1,3 +1,4 @@
 export PUPIL_PATH=../pupil
 #export PUPIL_PATH=/home/basile/data/src/pupil
 export GI_TYPELIB_PATH=/usr/local/lib/x86_64-linux-gnu/girepository-1.0/
+OUTPUT_PATH=/scratch/neuromod/data/

main.py

@@ -2,7 +2,6 @@
 from subprocess import Popen
 
 import os, sys, importlib
-import itertools
 from collections.abc import Iterable, Iterator
 
 from src.shared import config
@@ -21,13 +20,9 @@ def run(parsed):
         suggestion = suggest_session_tasks(parsed.tasks)
         raise(ValueError('session tasks file cannot be found for %s. Did you mean %s ?'%(parsed.tasks, suggestion)))
     from src.shared import cli
-    if parsed.skip_n_tasks:
-        if isinstance(tasks, Iterator):
-            tasks = itertools.islice(tasks, parsed.skip_n_tasks, None)
-        else:
-            tasks = tasks[parsed.skip_n_tasks:]
+
     try:
-        cli.main_loop(
+        """cli.main_loop(
             tasks,
             parsed.subject,
             parsed.session,
@@ -42,7 +37,12 @@ def run(parsed):
             parsed.skip_soundcheck,
             parsed.target_ETcalibration,
             parsed.validate_ET,
-            )
+            )"""
+
+        cli.main_loop(
+            ses_mod,
+            parsed
+        )
     finally:
         if not parsed.no_force_resolution:
             screen.reset_exp_screen()

src/sessions/ses-mario.py

@@ -73,3 +73,11 @@ def get_tasks(parsed):
     import importlib
     phase2 = importlib.import_module('src.sessions.ses-mario-phase2')
     yield from phase2.get_tasks(parsed)
+
+
+def get_config(parsed):
+    return {
+        'eyetracking_calibration_version': 1,
+        'eyetracking_validation': True,
+        'output_dataset': 'mario',
+    }

src/sessions/ses-mario3.py

@@ -100,9 +100,6 @@ def smb3_completion_fn(env):
     for run in range(10):
 
         next_levels = [f"1Player.World{world}.{level}" for idx,(world,level) in design[savestate['index']:savestate['index']+20].iterrows()]
-        if len(next_levels) < 5:
-            print('Stable phase completed, no more levels to play')
-            return []
 
         task = videogame.VideoGameMultiLevel(
             game_name='SuperMarioBros3-Nes',
@@ -125,11 +122,15 @@ def smb3_completion_fn(env):
 
         #only increment if the task was not interrupted, if interrupted, it needs to be rescan
         if task._task_completed:
+            print('saving savestate')
             savestate['index'] += task._nlevels
             with open(savestate_path, 'w') as f:
                 json.dump(savestate, f)
 
-        yield task_base.Pause(
-            text="You can take a short break.\n Press A when ready to continue",
-            wait_key='a',
-        )
+def get_config(parsed):
+    return {
+        'eyetracking_calibration_version': 2,
+        'eyetracking_validation': True,
+        'add_pauses': True,
+        'output_dataset': 'mario3',
+    }

src/sessions/ses-mariomeg.py

@@ -79,3 +79,11 @@ def get_tasks(parsed):
             text="You can take a short break.\n Press A when ready to continue",
             wait_key='a',
         )
+
+def get_config(parsed):
+    return {
+        'eyetracking_calibration_version': 1,
+        'eyetracking_validation': True,
+        'output_dataset': 'mariomeg',
+        'meg': True,
+    }

src/sessions/ses-mariostars.py

@@ -115,3 +115,11 @@ def get_tasks(parsed):
             text="You can take a short break.\n Press A when ready to continue",
             wait_key='a',
         )
+
+
+def get_config(parsed):
+    return {
+        'eyetracking_calibration_version': 1,
+        'eyetracking_validation': True,
+        'output_dataset': 'mariostars',
+    }

src/sessions/ses-triplet.py

@@ -140,3 +140,11 @@ def generate_design_file(subject, all_triplets, pilot=False):
     else:
         all_triplets = pandas.read_csv(os.path.join(TRIPLET_DATA_PATH, 'fMRI_triplets.csv'))
     generate_design_file(parsed.subject, all_triplets, parsed.pilot)
+
+
+def get_config(parsed):
+    return {
+        'eyetracking_calibration_version': 1,
+        'eyetracking_validation': True,
+        'output_dataset': 'triplets',
+    }