Skip to content

Trialidx #23

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

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Trialidx #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
027410d
Adds support for returning stim only for certain trials
grero Jun 24, 2020
982491d
Adds tests
grero Jun 24, 2020
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
7 changes: 5 additions & 2 deletions DataProcessingTools/trialstructures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,15 @@ def get_timestamps(self, event_label):

return self.timestamps[idx], self.trialidx[idx], self.stimidx[idx]

def get_stim(self, stimidx=0):
def get_stim(self, stimidx=0, trialidx=None):
"""
Return the timestamp, identity and location of the stimulus
at `stimidx` of every trial.
"""
fidx = np.where(self.stimidx==stimidx)[0]
fidx = self.stimidx==stimidx
if trialidx is not None:
qidx = np.isin(self.trialidx, trialidx)
fidx = fidx & qidx
p = re.compile("stimulus_on_([0-9]+)_([0-9]+)")
location = []
identity = []
Expand Down
5 changes: 5 additions & 0 deletions tests/test_trialstructures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ def test_working_memory():
assert location.count(2) == 431
assert location.count(3) == 312

# only correct trials
reward_onset, ridx, _ = trials.get_timestamps("reward_on")
stim1_onset, identity, location = trials.get_stim(0, ridx)
assert len(stim1_onset) == 395

testdir = "animal/20130923/session01"
with DPT.misc.CWD(os.path.join(os.path.dirname(__file__),testdir)):
trials = DPT.trialstructures.WorkingMemoryTrials()
Expand Down