Skip to content

Push back to mothership #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nwilming wants to merge 64 commits into
base: master
Choose a base branch
from
Open

Push back to mothership #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
a523b48
Start cleaning up
nwilming Feb 20, 2017
4a4d576
More cleaning up
nwilming Feb 20, 2017
43e36f7
First version of experiment
nwilming Feb 20, 2017
8b9499d
V0.5
nwilming Feb 21, 2017
4c13878
With instructions and different keys for training and test
Feb 21, 2017
12a0c5b
Some pilot data
Feb 21, 2017
adce54e
V0.75
Feb 21, 2017
6bdd188
Change rewards such that both rules can be rewarded
Feb 22, 2017
ab7fc4d
Sync
nwilming Feb 22, 2017
d1b2eb3
Merge branch 'master' of github.com:nwilming/ptb
nwilming Feb 22, 2017
f11a0cc
Add changeover delay and update sequence generation code
nwilming Feb 28, 2017
4efa74a
Add COD and 75% / IBI 15 stimulus sequences
nwilming Mar 1, 2017
f1bd6d2
New sequences with 75%, IBI=15, ISI=2-4
nwilming Mar 1, 2017
10bbc51
Fix Eyelink bugs with new screen setup in psychophysics lab
Mar 1, 2017
62f55cc
Sync
nwilming Mar 1, 2017
9eb5942
Merge branch 'master' of github.com:nwilming/ptb
nwilming Mar 1, 2017
a3a0465
Add sequences with 2 reward probs and IBI 10, 15 and 20
nwilming Mar 2, 2017
6731bcb
Add partial reward and blink period
nwilming Mar 9, 2017
1a208fd
IBI=10, ISI=[2,8]
nwilming Mar 9, 2017
50cf9d3
Sync
Mar 9, 2017
c395970
Add display parameters for retino
nwilming Mar 27, 2017
6aef886
Beta version for predictive inference task
nwilming Mar 27, 2017
6ec58d1
Add display calibration tests
nwilming Mar 29, 2017
7f76d1a
Merge branch 'master' of https://github.com/nwilming/ptb
Mar 29, 2017
10a41ed
Merge branch 'master' of https://github.com/nwilming/ptb
Mar 29, 2017
5c6a902
Add gamma table for vpixx eeg monitor
Mar 29, 2017
4f98c43
Sync
nwilming Mar 29, 2017
a5b722f
Measure grating on psychlab stimulus pc
Mar 29, 2017
88b70d3
Complete version of predictive inference + left/right choice task
nwilming Mar 30, 2017
b9d3158
Merge branch 'predictive_inference' of github.com:nwilming/ptb into p…
nwilming Mar 30, 2017
8d2dc28
Add cue validity localizer task
nwilming Apr 4, 2017
020daac
Clean up a bit
nwilming Apr 5, 2017
0fa07af
Ready for pilot session
nwilming Apr 9, 2017
9f87e99
Add latest connectivity experiment
nwilming May 8, 2017
8908062
Start implementing triangles task
nwilming May 8, 2017
70e829e
First working version of triangle task
nwilming May 8, 2017
8bc1739
Connectivity experiment ready for testing luminances
nwilming Jun 7, 2017
3a63723
Add gamma correction + fix saving of precomputed stimuli
nwilming Jun 7, 2017
cb87323
Almost done with number prediction task
Jun 8, 2017
a7c5a34
Correct reward computations in prediction task
nwilming Jun 26, 2017
70cbfde
Merge branch 'pinf_last_sample' of github.com:nwilming/ptb into pinf_…
nwilming Jun 26, 2017
b91ff2a
Properly merge and remove conflicts
Jun 27, 2017
309f562
Merge branch 'master' of github.com:nwilming/ptb into pinf_last_sample
nwilming Jun 27, 2017
9fee676
Sync
Jun 27, 2017
b877249
Merge branch 'pinf_last_sample' of github.com:nwilming/ptb into pinf_…
nwilming Jun 27, 2017
af7faa1
Measure pupil response to number samples
Jul 5, 2017
1108589
Pupil response to noisy number samples
Jul 5, 2017
22fe293
Sync
nwilming Jul 5, 2017
f2f3697
Merge
nwilming Aug 3, 2017
bc67cab
Sync with MRI scanner update
nwilming Aug 3, 2017
d14cb52
Update logging
nwilming Aug 4, 2017
6d05ee5
Correct doc, correct TR for retino
nwilming Aug 4, 2017
77f1ab1
Updated retino images w/ correct TR
nwilming Aug 4, 2017
cda8173
Fix duration and rule acceptance in GL task
Aug 4, 2017
7216f32
Fix timing errors. Err now below 2 frames on mac
nwilming Aug 5, 2017
14b4f36
Merge timing fixes into master
nwilming Aug 6, 2017
3309be7
Stop blocks after 10 minutes.
nwilming Aug 6, 2017
f932ae4
Better logging
nwilming Aug 6, 2017
36981ca
Make instructed rule blocks last 10 minutes
nwilming Aug 10, 2017
20d5221
Sync
nwilming Oct 4, 2017
3c91832
Fix bug in instructed rule trials
nwilming Nov 8, 2017
32caf4f
Adjust pathes
Nov 17, 2017
4bc192a
Merge branch 'pinf_last_sample' of https://github.com/nwilming/ptb in…
Nov 17, 2017
cf29551
Fix presentation of percentages
Nov 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,111 changes: 0 additions & 1,111 deletions FearGen_BDNF_eyelab.m
View file
Open in desktop

This file was deleted.

1,099 changes: 0 additions & 1,099 deletions FearGen_eyelab.m
View file
Open in desktop

This file was deleted.

1,131 changes: 0 additions & 1,131 deletions FearGen_eyelab_PlaPil.m
View file
Open in desktop

This file was deleted.

203 changes: 0 additions & 203 deletions FeargenSequence_ET.m
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions InitSerialPort.m
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions KbQueueDump.m
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions SendPulses.m
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions WaitForPulseZero.m
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions WaitPulse.m
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions WaitPulseStrictlyAfterNow.m
View file
Open in desktop

This file was deleted.

Loading