Skip to content

1919-time-column-names #1953

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 7 commits into from
Feb 26, 2021
Merged

1919-time-column-names #1953

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2fa3f50
makes rewards timestamps column not index
djkapner Feb 25, 2021
a8a28c5
renames lick time column to timestamps
djkapner Feb 25, 2021
c77f768
renames eye_tracking time column to timestamps
djkapner Feb 25, 2021
a51e609
fixes nightly tests
djkapner Feb 25, 2021
9189fdf
reorder lick columns
djkapner Feb 25, 2021
948ad0c
pep8
djkapner Feb 25, 2021
bf3b698
fixes pep8 mistake
djkapner Feb 26, 2021
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
5 changes: 2 additions & 3 deletions allensdk/test/brain_observatory/behavior/test_behavior_lims_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,8 @@ def test_stim_file_regression(self):
== self.od.extractor.get_behavior_stimulus_file())

def test_get_rewards_regression(self):
"""Index is timestamps here, so remove it before comparing."""
bd_rewards = self.bd.get_rewards().reset_index(drop=True)
od_rewards = self.od.get_rewards().reset_index(drop=True)
bd_rewards = self.bd.get_rewards().drop(columns=['timestamps'])
od_rewards = self.od.get_rewards().drop(columns=['timestamps'])
pd.testing.assert_frame_equal(bd_rewards, od_rewards)

def test_ophys_experiment_id_regression(self):
Expand Down
14 changes: 7 additions & 7 deletions allensdk/test/brain_observatory/behavior/test_behavior_ophys_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ def test_visbeh_ophys_data_set():
assert stimulus_templates['im000'].warped.shape == MONITOR_DIMENSIONS
assert stimulus_templates['im000'].unwarped.shape == MONITOR_DIMENSIONS

assert len(data_set.licks) == 2421 and list(data_set.licks.columns) \
== ['time', 'frame']
assert len(data_set.rewards) == 85 and list(data_set.rewards.columns) == \
['volume', 'autorewarded']
assert len(data_set.licks) == 2421 and set(data_set.licks.columns) \
== set(['timestamps', 'frame'])
assert len(data_set.rewards) == 85 and set(data_set.rewards.columns) == \
set(['timestamps', 'volume', 'autorewarded'])
assert len(data_set.corrected_fluorescence_traces) == 258 and \
sorted(data_set.corrected_fluorescence_traces.columns) == \
['cell_roi_id', 'corrected_fluorescence']
set(data_set.corrected_fluorescence_traces.columns) == \
set(['cell_roi_id', 'corrected_fluorescence'])
np.testing.assert_array_almost_equal(data_set.running_speed.timestamps,
data_set.stimulus_timestamps)
assert len(data_set.cell_specimen_table) == len(data_set.dff_traces)
assert data_set.average_projection.data.shape == \
data_set.max_projection.data.shape
assert list(data_set.motion_correction.columns) == ['x', 'y']
assert set(data_set.motion_correction.columns) == set(['x', 'y'])
assert len(data_set.trials) == 602

expected_metadata = {
Expand Down