search

berkeley-stat159 / project-theta

BSD 3-Clause "New" or "Revised" License
0 stars 4 forks source link

Mergecond #62

Closed BenjaminHsieh closed 8 years ago

BenjaminHsieh commented 8 years ago

Check if this works, merging all tasks

changsiyao commented 8 years ago

I'm getting an error like "append() takes at most 3 arguments (4 given)" when calling merge_cond()... Can you check that?

BenjaminHsieh commented 8 years ago

Yeah will check On Nov 18, 2015 8:37 PM, "changsiyao" notifications@github.com wrote:

I'm getting an error like "append() takes at most 3 arguments (4 given)" when calling merge_cond()... Can you check that?

— Reply to this email directly or view it on GitHub https://github.com/berkeley-stat159/project-theta/pull/62#issuecomment-157948875 .

BenjaminHsieh commented 8 years ago

Should work now

changsiyao commented 8 years ago

behav_task.shape[1] != 12 not 9, I think. time_course = np.zeros((n_trs, 10))

BenjaminHsieh commented 8 years ago

Sry got sloppy

BenjaminHsieh commented 8 years ago

Someone can merge this if we are good