fix happy

Author: Shotgunosine

tasks/happy.py

@@ -11,33 +11,35 @@ def make_trials(config):
     for mm in temp_moods:
         trial = dict(
             inst=f"How {mm['mood']} are you at this moment?\nPress F to move left, Press J to move right.",
-            mood=mm['mood'],
-            notmood=mm['notmood']
+            mood=mm['mood'].title(),
+            notmood=mm['notmood'].title()
         )
         trials.append(trial)
     return trials
 
 @Subroutine
 def HappyQuest(self, task, block_num, trial_num, config=default_happy_config):
-    gen = Func(
-        make_trials,
-        config
-    )
-    trials = gen.result
+    # gen = Func(
+    #     make_trials,
+    #     config
+    # )
+    # trials = gen.result
+
+    trials = make_trials(config)
 
     with UntilDone():
 
         with Loop(trials) as trial:
             Wait(0.3)
             with Parallel():
-                Label(text=Ref(trial.current['inst']),
+                Label(text=trial.current['inst'],
                       font_size=s(config.HAPPY_FONT_SIZE),
                       halign='center',
                       center_y=self.exp.screen.center_y + s(300))
                 sld = Slider(min=-10, max=10, value=0, width=s(config.SLIDER_WIDTH))
-                Label(text=Ref(trial.current['notmood']), font_size=s(config.HAPPY_FONT_SIZE),
+                Label(text=trial.current['notmood'], font_size=s(config.HAPPY_FONT_SIZE),
                       center_x=sld.left, center_y=sld.center_y - s(100))
-                Label(text=Ref(trial.current['mood']), font_size=s(config.HAPPY_FONT_SIZE),
+                Label(text=trial.current['mood'], font_size=s(config.HAPPY_FONT_SIZE),
                       center_x=sld.right, center_y=sld.center_y - s(100))
                 Label(text='Press Spacebar to lock-in your response.',
                       top=sld.bottom - s(250), font_size=s(config.HAPPY_FONT_SIZE))
@@ -74,7 +76,7 @@ def HappyQuest(self, task, block_num, trial_num, config=default_happy_config):
                     submit = KeyPress(keys=['SPACEBAR'])
             Log(name="happy",
                 task=task,
-                mood=Ref(trial.current['mood']),
+                mood=trial.current['mood'],
                 block_num=block_num,
                 trial_num=trial_num,
                 slider_appear=sld.appear_time,
@@ -86,8 +88,9 @@ def HappyQuest(self, task, block_num, trial_num, config=default_happy_config):
 if __name__ == "__main__":
     import config
 
-    exp = Experiment(debug=True)
+    exp = Experiment()
 
-    HappyQuest(config, 'test', 0)
+    HappyQuest(task='test', block_num=0, trial_num=0)
+    HappyQuest(task='test', block_num=0, trial_num=1)
 
     exp.run()