search

justingardner / mgl

A suite of mex/m files for displaying psychophysics stimuli
http://justingardner.net/mgl
Other
18 stars 22 forks source link

Moncalib search space #15

Closed dbirman closed 8 years ago

dbirman commented 8 years ago

Merging the fast-search algorithm into the base MGL--we keep forgetting that this exists and wasting time. Would be useful to have it setup properly. Basically adds a flag to moncalib(fastSearch=1) that does an accelerated search of the space where luminances tend to be zero and the calibration gets stuck (so checks lum=1, 2, 4, 8, ... until it gets a measurement, then reverses until it gets nothing again, and assumes all values below that point are 0 luminance).

Other minor changes: -fixed moncalib crashing on verbose checks -for some reason there is some code in this branch that modifies addCalculatedVar to add a backup flag, might as well merge this as well.

The default functionality of moncalib() and addCalculatedVar() don't change in this merge, you have to explicitly call the new code.

dbirman commented 8 years ago

@justingardner do you want to take a look at this? I don't want to forget that this branch is open the next time I run a calibration. I've used it 3 times now with no errors so I think it's safe to merge. Default functionalities don't change.

justingardner commented 8 years ago

Something weird with this pull request - it won't let me do it from here and asks me to do it by the command line - seems like there is a conflict in .gitignore - when I try to resolve that it says that there are lots of files that will be modified (mgllib/mglOpen.m mglClearScreen mglClose, etc. etc.) which seems wrong. Anyway, can you remove this pull request and try again (this time make sure that the .gitignore file doesn't conflict)?

dbirman commented 8 years ago

Okay will do