Skip to content

Commit

Permalink
Post release revision for update to readme
Browse files Browse the repository at this point in the history
  • Loading branch information
k1o0 committed Jun 19, 2023
1 parent 4095a0a commit fb8fe34
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Coverage Status](https://coveralls.io/repos/github/cortex-lab/psychofit/badge.svg?branch=master)](https://coveralls.io/github/cortex-lab/psychofit?branch=master)
[![CI](https://github.com/cortex-lab/psychofit/actions/workflows/main.yaml/badge.svg)](https://github.com/cortex-lab/psychofit/actions/workflows/main.yaml)

A module for fitting 2AFC psychometric data
A module for fitting 2AFC psychometric data.

The psychofit module contains tools to fit two-alternative psychometric
data. The fitting is done using maximal likelihood estimation: one
Expand All @@ -14,18 +14,19 @@ The data can be expressed in fraction correct (from 50 to 100%) or in
fraction of one specific choice (from 0 to 100%). To fit them you can use
these functions:

- `weibull50` - Weibull function from 0.5 to 1, with lapse rate
- `weibull` - Weibull function from 0 to 1, with lapse rate
- `erf_psycho` - erf function from 0 to 1, with lapse rate
- `erf_psycho_2gammas` - erf function from 0 to 1, with two lapse rates
- `weibull50` - Weibull function from 0.5 to 1, with lapse rate.
- `weibull` - Weibull function from 0 to 1, with lapse rate.
- `erf_psycho` - erf function from 0 to 1, with lapse rate.
- `erf_psycho_2gammas` - erf function from 0 to 1, with two lapse rates.

Functions in the toolbox are:

- `mle_fit_psycho` - Maximumum likelihood fit of psychometric function
- `neg_likelihood` - Negative likelihood of a psychometric function
- `mle_fit_psycho` - Maximumum likelihood fit of psychometric function.
- `neg_likelihood` - Negative likelihood of a psychometric function.

For more info, see:
Examples - Examples of use of psychofit toolbox

- `Examples.ipynb` - Examples of use of psychofit toolbox.

Matteo Carandini (2000-2017) initial Matlab code<br>
Miles Wells (2017-2018) ported to Python
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

setup(
name='Psychofit',
version='1.0.0',
version='1.0.0-r0',
python_requires='>=3.7',
description='A module for fitting 2AFC psychometric data',
license='MIT',
long_description=long_description,
long_description_content_type='text/markdown',
author='Matteo Carandini & Miles Wells',
url='https://github.com/cortex-lab/psychofit',
classifiers = [
classifiers=[
'Programming Language :: Python :: 3',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
Expand Down

0 comments on commit fb8fe34

Please sign in to comment.