Merge pull request #2716 from hoechenberger/doc

DOC: QUEST documentation fixes
psychopy · Dec 9, 2019 · 8c5de03 · 8c5de03
2 parents 1eec06f + e6ba80c
commit 8c5de03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/psychopy/contrib/quest.py b/psychopy/contrib/quest.py
@@ -61,7 +61,7 @@ class QuestObject(object):
 
     The Weibull psychometric function:
 
-    p2=delta*gamma+(1-delta)*(1-(1-gamma)*exp(-10**(beta*(x2+xThreshold))))
+    p2=delta*gamma+(1-delta)*(1-(1-gamma)*exp(-10**(beta*(x-xThreshold))))
 
     where x represents log10 contrast relative to threshold. The
     Weibull function itself appears only in recompute(), which uses

diff --git a/psychopy/data/staircase.py b/psychopy/data/staircase.py
@@ -697,8 +697,7 @@ class QuestHandler(StairHandler):
 
     The Weibull psychometric function:
 
-    _e = -10**(beta * (x2 + xThreshold))
-    p2 = delta * gamma + (1-delta) * (1 - (1 - gamma) * exp(_e))
+    Psi(x) = delta * gamma + (1-delta) * (1 - (1 - gamma) * exp(-10 ** (beta * (x - xThreshold))))
 
     **Example**::