Merge branch 'master' into band_selection

backend/bci_core/model.py

@@ -52,7 +52,7 @@ class ChannelScaler(BaseEstimator, TransformerMixin):
 
 def riemann_model(C=1.):
     return make_pipeline(
-        Whitening(metric='euclid', dim_red={'expl_var': 0.99}),
+        Whitening(metric='riemann', dim_red={'expl_var': 0.99}),
         TangentSpace(),
         LogisticRegression(C=C)
     )

backend/free_grasp.psyexp

@@ -95,7 +95,7 @@
         <Param val="" valType="extendedCode" updates="constant" name="Begin Experiment"/>
         <Param val="" valType="extendedCode" updates="constant" name="Begin JS Experiment"/>
         <Param val="" valType="extendedCode" updates="constant" name="Begin JS Routine"/>
-        <Param val="# state changed&amp;#10;feedback_bar1.progress = force&amp;#10;if decision != -1:&amp;#10;    feedback_time = 5&amp;#10;    if not decision:&amp;#10;        trigger.send_trigger(0)&amp;#10;        hand_device.extend()&amp;#10;    else:&amp;#10;        trigger.send_trigger(decision)&amp;#10;        hand_device.start(model=fingermodel_ids_inverse[decision])&amp;#10;else:&amp;#10;    feedback_time = 0&amp;#10;    " valType="extendedCode" updates="constant" name="Begin Routine"/>
+        <Param val="# state changed&amp;#10;feedback_bar1.progress = force&amp;#10;if decision != -1:&amp;#10;    feedback_time = 5&amp;#10;    if not decision:&amp;#10;        trigger.send_trigger(0)&amp;#10;        hand_device.extend()&amp;#10;    else:&amp;#10;        trigger.send_trigger(int(decision))&amp;#10;        hand_device.start(model=fingermodel_ids_inverse[decision])&amp;#10;else:&amp;#10;    feedback_time = 0&amp;#10;    " valType="extendedCode" updates="constant" name="Begin Routine"/>
         <Param val="Py" valType="str" updates="None" name="Code Type"/>
         <Param val="" valType="extendedCode" updates="constant" name="Each Frame"/>
         <Param val="" valType="extendedCode" updates="constant" name="Each JS Frame"/>

backend/free_grasp.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 """
 This experiment was created using PsychoPy3 Experiment Builder (v2023.2.3),
-    on Wed Nov 22 18:42:41 2023
+    on 十一月 24, 2023, at 12:38
 If you publish work using this script the most relevant publication is:
 
     Peirce J, Gray JR, Simpson S, MacAskill M, Höchenberger R, Sogo H, Kastman E, Lindeløv JK. (2019) 
@@ -686,7 +686,7 @@ def run(expInfo, thisExp, win, inputs, globalClock=None, thisSession=None):
                 trigger.send_trigger(0)
                 hand_device.extend()
             else:
-                trigger.send_trigger(decision)
+                trigger.send_trigger(int(decision))
                 hand_device.start(model=fingermodel_ids_inverse[decision])
         else:
             feedback_time = 0