Skip to content
This repository was archived by the owner on Dec 8, 2023. It is now read-only.

trialized and localization notebooks #54

Merged
merged 20 commits into from
Mar 31, 2022
Merged

trialized and localization notebooks #54

merged 20 commits into from
Mar 31, 2022

Conversation

CBroz1
Copy link
Contributor

@CBroz1 CBroz1 commented Mar 21, 2022 •
edited
Loading

No description provided.

kabilar and others added 6 commits March 18, 2022 09:53
@kabilar
Update service and container names
06663a3
@kabilar
Update image and container names
867098b
@CBroz1
Merge pull request #48 from kabilar/main
ced7350 
Update service and container names
@CBroz1
Rebase ephys modes w/event-related. See Details
c99ca15 
add tests for NWB export
accommodate different ephys modes (chronic, no-curation, etc.)
Create analysis.py
add trialized CSVs and ingestion functions
remove trial diagrams
Update docker service names
Code review co-authored-by: Kabilar Gunalan <kabilar@datajoint.com>
ingest.py: fix table list
AlignedSpikes calculation and plotting
add notebook 7 for analysis examples
add trials up to 100
@CBroz1
Trialized notebook. See details
e8bfc60 
Dockerfile.test: add element-trial
    Needs corresponding docker dev update
Docker-compose-test: update to new name system
    (rebasing overwrote it when merging branches unfortunately)
    Add Ephys mode to environment
    !! Future integration tests will neeed to check all options of ephys mode
requirements: fix conflict errors
Update csvs for subject6
notebook - downstream analysis - flush out for increased number of events
analysis: PEP8
@CBroz1
update readme for trialized
7be78e4
@CBroz1 CBroz1 requested a review from kabilar March 21, 2022 16:12
@kabilar kabilar self-assigned this Mar 21, 2022
@kabilar
Copy link
Collaborator

kabilar commented Mar 21, 2022 •
edited
Loading

Thanks @CBroz1. Once those pull requests on datajoint:main are merged, please pull from datajoint:main and you may need to rebase or perhaps it would resolve easily. But we can merge this pull request prior to the datajoint:main pull requests and resolve/rebase in a future pull request.

Also, just noticed that you may have to resolve conflicts on this pull request with datajoint:event.

@CBroz1
Copy link
Contributor Author

CBroz1 commented Mar 21, 2022

But we can merge this pull request prior to the datajoint:main pull requests and resolve/rebase in a future pull request.

Also, just noticed that you may have to resolve conflicts on this pull request with datajoint:event.

I'm happy to resolve in either order, but I think I would prefer the latter

  1. Rebasing my branch for datajoint:event and then merging into event - with later rebase/merge into datajoint:main
  2. Holding off pending current updates to datajoint:main, and then pulling them to my branch to update datajoint:event in this PR, minimizing the event/main diff in the process.

I'll hold off resolving conflicts here until we decide

@kabilar
Copy link
Collaborator

kabilar commented Mar 21, 2022

Option 2 sounds good to me. Thanks.

@kabilar
Copy link
Collaborator

kabilar commented Mar 23, 2022 •
edited
Loading

Hi @CBroz1, since #50 isn't yet merged, when you have a chance do you mind resolving conflicts with this pull request (and removing test_export.py) so that we can get these changes merged into datajoint:event. And then opening a pull request from datajoint:event to datajoint:main? Thanks.

Thinh Nguyen and others added 12 commits March 23, 2022 18:30
activate electrode-localization
a6d551d
Merge remote-tracking branch 'upstream/event' into event
0d13627
@CBroz1
jupytext, histology updates
d94f36c
@CBroz1
Rebase ttngu207:event with cbroz1:histology
b806531 
add tests for NWB export
accommodate different ephys modes (chronic, no-curation, etc.)
Create analysis.py
add trialized CSVs and ingestion functions
remove trial diagrams
Update service names
AlignedSpikes calculation and plotting
bugfix in plotting functions, add notebook 7 for analysis examples
activate electrode-localization in localization.py
@CBroz1
Localization NB, DummyTable for altering database case sensitivity
ddb6b56
@CBroz1
notebook update
8d8272f
improve trialized event-aligned unit spikes calculation
5338c9c
bugfix
3c9f7f1
@CBroz1
rename docker images
6419bc1
@CBroz1
rebase with ttngu207:event
47a2c12
@CBroz1
localization NB; snake_case acronyms
3544809
@CBroz1
add attached localization diagram; README edit; analysis import
9ae3071
@CBroz1
Copy link
Contributor Author

CBroz1 commented Mar 25, 2022

@kabilar - This is now fast-forwarded to include dev from PR #55 as well as updates to element-electrode-localization. While the latter isn't finalized, I think we're okay to put this out as a 'dev' branch

@CBroz1 CBroz1 changed the title trialized notebook trialized and localization notebooks Mar 25, 2022
@CBroz1 CBroz1 mentioned this pull request Mar 25, 2022
Closed
@ttngu207 ttngu207 merged commit a5ee2c6 into datajoint:event Mar 31, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ttngu207 ttngu207 ttngu207 approved these changes

@kabilar kabilar Awaiting requested review from kabilar

Assignees

@kabilar kabilar

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CBroz1 @kabilar @ttngu207