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.

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

Multicam DLC project support #834

Merged
merged 29 commits into from
Feb 21, 2024
Merged

Multicam DLC project support #834

merged 29 commits into from
Feb 21, 2024

Conversation

edeno
Copy link
Collaborator

@edeno edeno commented Feb 15, 2024

Description

Supersedes #684

Several lab members are using Daniel's branch for a multi-cam DLC project. This PR fetches from upstream and resolves conflicts.

Fixes:

Checklist:

  • This PR should be accompanied by a release: (yes/no/unsure)
  • (If release) I have updated the CITATION.cff
  • I have updated the CHANGELOG.md
  • I have added/edited docs/notebooks to reflect the changes

dpeg22 and others added 24 commits June 15, 2023 16:39
* Fault-permit insert and remove mutual exclusivity protections on Merge (#824)

* #719, #804, #212

* #768

* Add merge delete and populate

* Changes following PR review @edeno

* Replace delayed import of ImportedSpikeSorting

* Update CITATION.cff (#826)

* Update CITATION.cff

* Update change log

* Update ref

* Add MUA notebook and fix numbering.

* Only apply include labels filter if include_labels not empty (#827)

* dont skip unit if include_labels list is empty

* update check for np array size

* gh-actions docs fixes (#828)

* Update 'latest' in docs deploy

* Docs bugfix. Rename Link action, incorporate cspell.

* MUA as own heading

* Update README.md

* Fix citation

* Fix citation

* include all relevant restrictions on video file

* Proposed structure for user roles. (#832)

* Add roles

* Remove use of unix user group. Add note for retroactive role assign

* Add docs on roles and external tables. Reduce key length

* Fix test for update of position tools (#835)

Related to single LED halving the data bug

* fix build error in mamba and restriction for dlc

* flush stdout before converting mp4

* Fix notebook name (#840)

* remove deprecated yaml.safe_load function

* Fix test

* replace deprecated yaml.safe_load function

* only call no_transaction_make if video key not present

---------

Co-authored-by: Chris Brozdowski <[email protected]>
Co-authored-by: Eric Denovellis <[email protected]>
Co-authored-by: Eric Denovellis <[email protected]>
@edeno edeno marked this pull request as ready for review February 20, 2024 16:49
@edeno edeno requested a review from CBroz1 February 20, 2024 16:50
@edeno edeno changed the title Multicam Multicam DLC project support Feb 20, 2024
src/spyglass/position/v1/dlc_utils.py Outdated Show resolved Hide resolved
src/spyglass/position/v1/dlc_utils.py Outdated Show resolved Hide resolved
src/spyglass/position/v1/position_dlc_project.py Outdated Show resolved Hide resolved
src/spyglass/position/v1/position_dlc_project.py Outdated Show resolved Hide resolved
src/spyglass/position/v1/position_dlc_project.py Outdated Show resolved Hide resolved
Co-authored-by: Chris Brozdowski <[email protected]>
@edeno edeno requested a review from CBroz1 February 21, 2024 11:27
Copy link
Member

@CBroz1 CBroz1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just two minor things - need to import the logger, and don't need to run a fetch to get the table fields

src/spyglass/position/v1/dlc_utils.py Outdated Show resolved Hide resolved
src/spyglass/position/v1/dlc_utils.py Show resolved Hide resolved
Co-authored-by: Chris Brozdowski <[email protected]>
@edeno edeno merged commit eb25feb into master Feb 21, 2024
9 checks passed
@edeno edeno deleted the multicam branch February 21, 2024 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants