Pr for upstream

.gitignore

@@ -15,6 +15,9 @@ stimuli/landscapeMovie
 stimuli/movie/misc/natureClip.mov
 stimuli/movie/clips
 # Confidential
+stimuli/picture_sequence/pictures/
+stimuli/picture_sequence/eprime_demo/
+stimuli/story_sequence/story_sequence.csv
 stimuli/action_prediction/clips
 stimuli/action_prediction/archive/
 stimuli/frith_happe/clips
@@ -24,3 +27,4 @@ stimuli/liking/clips
 
 .idea/
 
+stimuli/faux_pas/faux_pas.csv

MultiTaskBattery/experiment_block.py

@@ -5,6 +5,7 @@
 import pandas as pd
 import sys
 import numpy as np
+from datetime import datetime
 
 from psychopy import visual, gui, event
 import MultiTaskBattery.utils as ut
@@ -129,6 +130,7 @@ def run(self):
         self.ttl_clock.reset()
         self.ttl_clock.wait_for_first_ttl(wait = self.wait_ttl)
         run_data = []
+        run_end_timestamp = None
 
         # Start the eyetracker
         if self.const.eye_tracker:
@@ -162,6 +164,8 @@ def run(self):
 
             # Add the end time of the task
             r_data['real_end_time'] = self.ttl_clock.get_time()
+            if getattr(self.const, 'record_run_end_timestamp', False) and t_num == len(self.task_obj_list) - 1:
+                run_end_timestamp = datetime.now().isoformat()
             run_data.append(r_data)
             self.screen.fixation_cross()
 
@@ -178,6 +182,8 @@ def run(self):
         run_data = pd.DataFrame(run_data)
         # save the run data to the run file
         run_data.insert(0,'run_num',[self.run_number]*len(run_data))
+        if getattr(self.const, 'record_run_end_timestamp', False) and run_end_timestamp is not None:
+            run_data['run_end_timestamp'] = run_end_timestamp
         ut.append_data_to_file(self.run_data_file, run_data )
 
 
@@ -214,7 +220,9 @@ def display_run_feedback(self, run_data):
                 scores.append([task_name, accuracy, rt])
 
         # Display settings
-        height = 1.3 # Height of the text elements
+        # Height of the text elements: allow experiment-specific override via
+        # const.scoreboard_text_height; fall back to original default (1.3 deg).
+        height = getattr(self.const, 'scoreboard_text_height', None) or 1.3
         gap = [8,1.6] # Gap between entries for the score column [gap_between_columns, gap_between_rows]
         cols=len(scores[0])
         rws=len(scores)

MultiTaskBattery/task_blocks.py

@@ -230,11 +230,14 @@ def init_task(self):
         """
         trial_info_file = self.const.task_dir / self.name / self.task_file
         self.trial_info = pd.read_csv(trial_info_file, sep='\t')
-        self.stim=[]
+        self.stim = []
+        picture_scale = self.trial_info['picture_scale'].iloc[0] if 'picture_scale' in self.trial_info.columns else 1.0
         for stim in self.trial_info['stim']:
             stim_path = self.const.stim_dir / self.name / stim
-            self.stim.append(visual.ImageStim(self.window, str(stim_path)))
-        self.corr_key = [self.trial_info['key_nomatch'].iloc[0],self.trial_info['key_match'].iloc[0]]
+            img = visual.ImageStim(self.window, str(stim_path))
+            img.size = img.size * picture_scale
+            self.stim.append(img)
+        self.corr_key = [self.trial_info['key_nomatch'].iloc[0], self.trial_info['key_match'].iloc[0]]
 
     def display_instructions(self):
         """
@@ -476,8 +479,7 @@ def run_trial(self, trial):
 
         event.clearEvents()
 
-        # Set text height according to constants or default value
-        height = getattr(self.const, 'theory_of_mind_text_height', None) or 1.25
+        height = trial.get('text_height', 1.25)
         wrapWidth=25
 
         # Display story
@@ -1057,7 +1059,7 @@ def init_task(self):
         Initialize task - default is to read the target information into the trial_info dataframe
         """
         self.trial_info = pd.read_csv(self.const.task_dir / self.name / self.task_file, sep='\t')
-        self.corr_key = [self.trial_info['key_false'].iloc[0],self.trial_info['key_true'].iloc[0]]
+        self.corr_key = [self.trial_info['key_false'].iloc[0], self.trial_info['key_true'].iloc[0]]
 
     def display_instructions(self):
         """
@@ -1112,109 +1114,6 @@ def run_trial(self, trial):
 
         return trial
 
-class SemanticSwitching(Task):
-    """
-    Read a sentence and decide if the last word of the sentence makes sense.
-    Click "3" if the last word makes sense; click "4" if not. Be as accurate
-    and fast as possible.
-    """
-
-    def __init__(self, info, screen, ttl_clock, const, subj_id):
-        super().__init__(info, screen, ttl_clock, const, subj_id)
-        self.feedback_type = 'acc+rt'
-
-    def init_task(self):
-        """
-        Initialize task - default is to read the target information into the
-        trial_info dataframe.
-        """
-        self.trial_info = pd.read_csv(
-            self.const.task_dir / self.name / self.task_file, sep='\t'
-        )
-        self.corr_key = [
-            self.trial_info['key_false'].iloc[0],
-            self.trial_info['key_true'].iloc[0],
-        ]
-
-    def display_instructions(self):
-        """
-        Display instructions for the semantic switching task.
-        """
-        str1 = "You will read a sentence and decide if the last word makes sense."
-        str2 = f"If it makes sense, press {self.corr_key[1]}"
-        str3 = f"If it doesn't make sense, press {self.corr_key[0]}"
-        self.instruction_text = (
-            f"{self.descriptive_name} Task\n\n {str1} \n {str2} \n {str3}"
-        )
-        instr_visual = visual.TextStim(
-            self.window,
-            text=self.instruction_text,
-            height=self.const.instruction_text_height,
-            color=[-1, -1, -1],
-        )
-        instr_visual.draw()
-        self.window.flip()
-
-    def run_trial(self, trial):
-        """Runs a single trial of the semantic switching task."""
-        height_word = 2
-
-        event.clearEvents()
-
-        # Sentence is stored with '|' delimiters
-        sentence = trial['sentence']
-        words = sentence.split('|')
-
-        # Show words sequentially, 800 ms each
-        for word in words:
-            word_stim = visual.TextStim(
-                self.window,
-                text=word,
-                pos=(0.0, 0.0),
-                color=(-1, -1, -1),
-                units='deg',
-                height=height_word,
-            )
-            word_stim.draw()
-            self.window.flip()
-            self.ttl_clock.wait_until(self.ttl_clock.get_time() + 0.8)
-
-        event.clearEvents()
-
-        # Fixation cross
-        self.screen.fixation_cross()
-        self.ttl_clock.wait_until(self.ttl_clock.get_time() + 0.5)
-        event.clearEvents()
-
-        # Display last word
-        last_word_stim = visual.TextStim(
-            self.window,
-            text=trial['last_word'],
-            pos=(0.0, 0.0),
-            color=(-1, -1, -1),
-            units='deg',
-            height=height_word,
-            wrapWidth=30,
-        )
-        last_word_stim.draw()
-        self.window.flip()
-
-        event.clearEvents()
-
-        # Collect response
-        trial['response'], trial['rt'] = self.wait_response(
-            self.ttl_clock.get_time(),
-            trial['sentence_dur'],
-        )
-        trial['correct'] = (trial['response'] == self.corr_key[trial['trial_type']])
-
-        # Feedback
-        self.display_trial_feedback(
-            trial['display_trial_feedback'],
-            trial['correct'],
-        )
-
-        return trial
 
 class VisualSearch(Task):
 
@@ -1375,42 +1274,66 @@ def run_trial(self, trial):
         picture_path = Path(self.const.stim_dir) / self.name / 'pictures' / picture_file_name
         # Convert Pathself object to string for compatibility
         picture_path_str = str(picture_path)
-        # Create an ImageStim object
-        picture = visual.ImageStim(self.window, str(picture_path_str))
+        # Create an ImageStim object, explicitly centered so that the four answer
+        # options (placed symmetrically above and below) straddle the image.
+        picture = visual.ImageStim(self.window, str(picture_path_str), pos=(0, 0))
         # Make the picture smaller
         picture_scale = getattr(self.const, 'rmet_picture_scale', None) or 0.7
         picture.size = picture.size * picture_scale
 
 
 
         # --- Answers ---
-        # Get the answer options
-        answer_options = trial['options']
-        # Separate them into four strings
-        answer_options = answer_options.split(',')
-        # Create TextStim objects for each answer option
+        # Get the answer options and split into four strings
+        answer_options = str(trial['options']).split(',')
+
+        # Create TextStim objects for each answer option with a colored index and
+        # black option text. The spatial layout and string breakup are preserved:
+        # only formatting (height and color) is controlled here.
         answer_stims = []
+        option_height = trial.get('option_text_height', 1.2)
+        index_height = option_height * 0.85
+        pos_scale = trial.get('option_position_scale', 1.0)
+
+        # Small horizontal offset so that, visually, the options sit slightly
+        # closer to the centre and the eye picture looks better centered between
+        # them on wide screens.
+        x_offset = -1.0
+
         for i, option in enumerate(answer_options):
-            # 0 and 1 should be on the left and right of the top line (y position 7 and x positions -7 and 7)
-            # 2 and 3 should be on the left and right of the bottom line (y position -7 and x positions -7 and 7)
-            x = -8 if i % 2 == 0 else 6
-            y = 5 if i < 2 else -5
-
-            if len (option) < 3:
-                tabs = 2
-            elif len(option) < 9:
-                tabs = 3
-            else:
-                tabs = 4
-            tab_string = ''.join(["\t"] * tabs)
-            answer_stim = visual.TextStim(self.window, text=f'{i+1}.{tab_string}',
-                                          pos=(x, y-0.04), color='blue', height=1, alignHoriz='center')
+            # 0 and 1 on top left/right; 2 and 3 on bottom left/right.
+            base_x = -8 if i % 2 == 0 else 6
+            base_y = 5 if i < 2 else -5
+            x = base_x * pos_scale + x_offset
+            y = base_y * pos_scale
+
+            option_str = option.strip()
+            index_label = f'{i+1}.'
+            text_label = f'  {option_str}'
+
+            # Draw the numeric index in a distinct color (blue-ish) to visually
+            # separate it from the age/feeling text.
+            index_stim = visual.TextStim(
+                self.window,
+                text=index_label,
+                pos=(x, y),
+                color=[-1, -1, 1],  # blue index on grey/white background
+                height=index_height,
+                alignHoriz='left',
+            )
 
-            answer_stims.append(answer_stim)
-            tab_string = ''.join(["\t"] * (tabs-1))
-            answer_stim = visual.TextStim(self.window, text=f'{tab_string}{option}',
-                                          pos=(x, y), color=[-1, -1, -1], height=1.4, alignHoriz='center')
-            answer_stims.append(answer_stim)
+            # Draw the actual answer text in standard black, slightly to the right
+            # of the index so the combined appearance matches "1.  option".
+            text_stim = visual.TextStim(
+                self.window,
+                text=text_label,
+                pos=(x + 0.8, y),
+                color=[-1, -1, -1],
+                height=option_height,
+                alignHoriz='left',
+            )
+
+            answer_stims.extend([index_stim, text_stim])
 
         # Display stimuli
         picture.draw()
@@ -1979,7 +1902,7 @@ def run_trial(self, trial):
 
         event.clearEvents()
 
-        height = getattr(self.const, 'faux_pas_text_height', None) or 1.25
+        height = trial.get('text_height', 1.25)
         # Display story
         story = trial['story']
         # story = '.\n'.join(story.split('. '))
@@ -2866,4 +2789,4 @@ def run_trial(self, trial):
                 self.window.flip()
                 self.ttl_clock.update()
 
-        return trial
+        return trial