ticket/PSB155: Add is_sham_change column. #2715
Conversation
morriscb
force-pushed
the
ticket/PSB-155/dev
branch
from
33c0ddb to
3deb1e5
Compare
There was a problem hiding this comment.
Why did Corbett set a condition, (stimulus_block==5) & (is_sham_change) that is commented as the passive block and you only needed to use the condition ~stim_df.active? Corbett used stim_df.active to subset the active rows but didn't use the inverse to subset the passive rows.
Corbett is assuming that block 5 is a replay block, that is the same stimulus is replayed to the mouse. Both his and my code copies information from the trials table and related columns (is_sham_change being one) from the active into this reply block. The code I wrote is more general in case in the future there are 1) more than one active block 2) more than one replay block. In short it's doing the same thing but doesn't relying on assuming the block numbers. |
morriscb
force-pushed
the
ticket/PSB-155/dev
branch
from
d3b3e35 to
8aaed67
Compare
Move trials_id and simplify calculation. Add active calculation. Add loading trails to presentations table creation code. Add unittests for new stimulus calculations. Change test for trials_id to account for gaps in trials.
morriscb
force-pushed
the
ticket/PSB-155/dev
branch
from
bbee8b4 to
584144c
Compare
Add is_sham_change to stimulus presentations.
Add trials as an optional input to allow for calculating new columns: active, is_sham_change.
Move trials_id calculation to stimulus presentations init to better handle all presentations table creation modes.
Add int typing enforcement to trials table.
Add active, and is_sham_change to stimulus processing. Simplify trials_id calculation.
Add unittests for active and is_sham_change column calculation and update other unittests.
Note:
Will update linting failures before merge to avoid chaff from non-change files.Updating on #2712