Skip to content
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

Jump to bottom

Incorporate new block plots from update_block_plots branch into the pipeline #423

Merged
merged 17 commits into from
Oct 4, 2024
Merged

Incorporate new block plots from update_block_plots branch into the pipeline #423

merged 17 commits into from
Oct 4, 2024

Conversation

ttngu207
Copy link
Contributor

@ttngu207 ttngu207 commented Oct 1, 2024

This PR is based on Jai's work from the update_block_plots branch

  • Incorporate all plots into two tables BlockPatchPlots and BlockSubjectPositionPlots tables
  • Update BlockSubjectAnalysis to store running_preference_by_time and running_preference_by_wheel
  • Store ethogram data in BlockSubjectPositionPlots table
  • Update SciViz to render the new plots
  • Replacing the old plot table BlockPlots

Replacing #399

ttngu207 added 11 commits August 30, 2024 19:16
@ttngu207
feat(block_plots): update block plots based on Jai's work
a72a907
@ttngu207
feat(block_analysis): Store the running preference in `BlockSubjectAn…
48399ef 
…alysis.Preference`
@ttngu207
feat(block_analysis): add & test BlockPatchPlots and `BlockSubjectP…
f3f1d95 
…ositionPlots` tables
@ttngu207
feat(sciviz): new block plots
d09513d
@ttngu207
fix(sciviz): pin scipy<=1.13 for pharus(python3.9)
5b55b89
@ttngu207
fix(sciviz): fix layout
2d96ca5
@ttngu207
fix(sciviz): bugfix plot layout
3eb999f
@ttngu207
Merge remote-tracking branch 'upstream/datajoint_pipeline' into dataj…
c0391df 
…oint_pipeline
@ttngu207
Merge remote-tracking branch 'upstream/datajoint_pipeline' into dev_b…
2bab188 
…lock_plots_w_ethogram
@ttngu207
style(block_analysis): black formatting
d7ed2de
@ttngu207
Merge pull request #422 from ttngu207/dev_block_plots_w_ethogram
03d3689 
Incorporate new block plots from `update_block_plots` branch into the pipeline
@ttngu207 ttngu207 requested a review from jkbhagatio October 1, 2024 14:22
@ttngu207 ttngu207 mentioned this pull request Oct 1, 2024
Closed
@ttngu207
Copy link
Contributor Author

ttngu207 commented Oct 4, 2024

@jkbhagatio I've tested the newly committed changes. All good, this PR can be merged, feel free to do so (unless there's something else we should discuss/consider)

@jkbhagatio jkbhagatio merged commit c9d0d4a into datajoint_pipeline Oct 4, 2024
@jkbhagatio jkbhagatio deleted the tn-dev_block_plots_w_ethogram branch November 14, 2024 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkbhagatio jkbhagatio Awaiting requested review from jkbhagatio

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ttngu207 @jkbhagatio