Skip to content

Commit ac69858

Browse files
author
LegrandNico
committed
HRD: Fix confidence tutorial that was showing extero trials when extero=False
1 parent 9646000 commit ac69858

File tree

1 file changed

+19
-42
lines changed

1 file changed

+19
-42
lines changed

cardioception/HRD/task.py

Lines changed: 19 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -951,25 +951,7 @@ def tutorial(parameters: dict, win: Optional[visual.Window] = None):
951951
condition = np.random.choice(["More", "Less"])
952952
alpha = -20.0 if condition == "Less" else 20.0
953953

954-
(
955-
condition,
956-
listenBPM,
957-
responseBPM,
958-
decision,
959-
decisionRT,
960-
confidence,
961-
confidenceRT,
962-
alpha,
963-
isCorrect,
964-
respProvided,
965-
ratingProvided,
966-
startTrigger,
967-
soundTrigger,
968-
responseMadeTrigger,
969-
ratingStartTrigger,
970-
ratingEndTrigger,
971-
endTrigger,
972-
) = trial(
954+
_ = trial(
973955
parameters,
974956
alpha,
975957
"Extero",
@@ -978,7 +960,9 @@ def tutorial(parameters: dict, win: Optional[visual.Window] = None):
978960
confidenceRating=False,
979961
)
980962

963+
###################
981964
# Confidence rating
965+
###################
982966
confidenceText = visual.TextStim(
983967
win, height=parameters["textSize"], text=parameters["Tutorial4"]
984968
)
@@ -992,35 +976,28 @@ def tutorial(parameters: dict, win: Optional[visual.Window] = None):
992976
if parameters["setup"] in ["test", "behavioral"]:
993977
parameters["oxiTask"].setup().read(duration=2)
994978

995-
# Run 5 training trials with confidence rating
979+
# Run n training trials with confidence rating
996980
for i in range(parameters["nConfidence"]):
997-
998-
# Ramdom selection of condition
999-
modality = np.random.choice(["Intero", "Extero"])
981+
modality = "Intero"
1000982
condition = np.random.choice(["More", "Less"])
1001983
stim_intense = np.random.choice(np.array([1, 10, 30]))
1002984
alpha = -stim_intense if condition == "Less" else stim_intense
1003-
(
1004-
condition,
1005-
listenBPM,
1006-
responseBPM,
1007-
decision,
1008-
decisionRT,
1009-
confidence,
1010-
confidenceRT,
1011-
alpha,
1012-
isCorrect,
1013-
respProvided,
1014-
ratingProvided,
1015-
startTrigger,
1016-
soundTrigger,
1017-
responseMadeTrigger,
1018-
ratingStartTrigger,
1019-
ratingEndTrigger,
1020-
endTrigger,
1021-
) = trial(parameters, alpha, modality, win=win, confidenceRating=True)
985+
_ = trial(parameters, alpha, modality, win=win, confidenceRating=True)
986+
987+
# If extero conditions required, show tutorial.
988+
if parameters["ExteroCondition"] is True:
989+
# Run n training trials with confidence rating
990+
for i in range(parameters["nConfidence"]):
991+
modality = "Extero"
992+
condition = np.random.choice(["More", "Less"])
993+
stim_intense = np.random.choice(np.array([1, 10, 30]))
994+
alpha = -stim_intense if condition == "Less" else stim_intense
995+
_ = trial(parameters, alpha, modality, win=win, confidenceRating=True)
1022996

997+
998+
#################
1023999
# End of tutorial
1000+
#################
10241001
taskPresentation = visual.TextStim(
10251002
win, height=parameters["textSize"], text=parameters["Tutorial5"]
10261003
)

0 commit comments

Comments
 (0)