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

Add table definitions #2

Merged

kabilar merged 20 commits into datajoint:master from CBroz1:master

Mar 3, 2022

Contributor

CBroz1 commented Jan 5, 2022 •

edited

Loading

See parallel PR in workflow-trial
Added standard repo docs (e.g., contribution guidelines)
Moved bpod notes to Establish full Bpod ingestion #3
Future dev time on getting trials and events from csvs

CBroz1 and others added 4 commits

January 4, 2022 17:47


          see ReadMe notes on progress

a4cdfc7


          more bpod notes

cf7947e


          minor nwb comment edits

8981c2d


          Merge branch 'master' into master

aebec78

CBroz1 requested a review from iamamutt

January 5, 2022 18:38


          minor edit to readme

ab9f035

kabilar assigned iamamutt


          README update pointing to djarchive for example data

dfa41c9

kabilar reviewed

View reviewed changes

element_trial/__init__.py Outdated Show resolved Hide resolved

Collaborator

kabilar commented Jan 24, 2022

Thanks @CBroz1. A few minor comments:

As we are making a push for alpha release, I would suggest moving the TODOs from the README to GitHub Issues.
If its not too difficult, please use git mv to rename the files that moved from the element_trial_behavior directory to the element_trial directory so that it is easier to track changes.

kabilar reviewed

View reviewed changes

element_trial/export/__init__.py Outdated Show resolved Hide resolved


          Apply suggestions from code review

8342d9e

Co-authored-by: Kabilar Gunalan <[email protected]>

Collaborator

kabilar commented Jan 24, 2022 •

edited

Loading

Hi @CBroz1, could you please give me read access to your element-trial fork? I would like to take a look at the changes there. Thanks.

CBroz1 added 2 commits

January 24, 2022 13:16


          Revert version to alpha; refactor README

a420a2c


          git mv for comparison. formatting

e3bbd89

kabilar reviewed

View reviewed changes

element_trial/trial.py Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

CONTRIBUTING.md Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

README.md Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

element_trial/__init__.py Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

element_trial/version.py Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

element_trial/event.py Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

element_trial/readers/bpod_fields_notes.py Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

element_trial/export/nwb.py Outdated Show resolved Hide resolved

CBroz1 and others added 3 commits

January 24, 2022 16:02


          Apply suggestions from code review

Co-authored-by: Kabilar Gunalan <[email protected]>


          Apply suggestion from code review: dj.io->dj.org

07b69a9

Co-authored-by: Kabilar Gunalan <[email protected]>


          Add Background.md, remove config example

e82adc6

ttngu207 reviewed

View reviewed changes

element_trial/trial.py Outdated Show resolved Hide resolved

Collaborator

kabilar commented Jan 26, 2022 •

edited

Loading

Hi @CBroz1, spoke with @iamamutt regarding workflow-trial and element-trial. @CBroz1 and I can continue to iterate on the general structure (not including the specific table architecture and make functions) using these pull requests (https://github.com/datajoint/workflow-trial/pull/1 and #2). Once we are comfortable with the general structure, we can close these pull requests and @iamamutt can then pull changes from @CBroz1's fork, and finish the development for the alpha release. @CBroz1, does this plan sound okay?

ttngu207 reviewed

View reviewed changes

element_trial/trial.py Outdated Show resolved Hide resolved

element_trial/trial.py Outdated Show resolved Hide resolved

dimitri-yatsenko reviewed

View reviewed changes

Background.md Outdated Show resolved Hide resolved


          Apply suggestions from code review

4e35af7

Co-authored-by: Thinh Nguyen <[email protected]>

CBroz1 changed the title ~~Add table definitions and bpod ingestion draft~~ WIP: Add table definitions and bpod ingestion draft


          CHANGELOG clarity

9aacfec

Collaborator

kabilar commented Feb 28, 2022

Hi @CBroz1, we have an updated strategy for this element. Let's get the basic table design created with this pull request, and in the next phase we can add support for Bpod. As such, let's move all Bpod scripts that are currently in this pull request to Issue #3 for future reference.

kabilar assigned kabilar and unassigned iamamutt

kabilar changed the title ~~WIP: Add table definitions and bpod ingestion draft~~ Add table definitions

CBroz1 added 5 commits

March 1, 2022 14:24


          remove bpod

38b38eb


          add diagrams


          edit readme diagram refs

62a7062


          edit readme diagram links typo

4554d64


          changelog formatting

514b6f4

kabilar reviewed

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

CHANGELOG.md Show resolved Hide resolved

kabilar reviewed

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

kabilar reviewed

View reviewed changes

README.md Outdated Show resolved Hide resolved


          Apply suggestions from code review

ee7d0fb

Co-authored-by: Kabilar Gunalan <[email protected]>

kabilar approved these changes

View reviewed changes

Collaborator

kabilar left a comment

Thanks @CBroz1! Great work.

As mentioned in the README, this is a work in progress. Merging now so that @ttngu207 can continue building this element.

kabilar merged commit 403ec93 into datajoint:master

ttngu207 pushed a commit to ttngu207/element-event that referenced this pull request


          Merge pull request datajoint#2 from ttngu207/causality-in-motion

21c3d3c

trial_start_time and trial_stop_time NULLABLE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet