-
Notifications
You must be signed in to change notification settings - Fork 151
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
Ticket/2545/dev #2604
Ticket/2545/dev #2604
Conversation
37a0ba7
to
304278c
Compare
…ata, schema, namespace remove pyproject.toml remove target_imaging_depth from behaviorcache
c7be0aa
to
f3f1a68
Compare
2779e75
to
4b75de6
Compare
4b75de6
to
b6d9d21
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall, just a few comments/questions. One thing we'll need to do is run this by @matchings and co on the SDK issue regarding the name and structure. If you could post a csv to that issue (#2545) with the updated table. Also, we'll try and fix the failing text before we merge.
...ervatory/behavior/data_objects/metadata/ophys_experiment_metadata/average_container_depth.py
Outdated
Show resolved
Hide resolved
field_of_view_shape=ophys_experiment_metadata._field_of_view_shape, | ||
imaging_depth=ophys_experiment_metadata._imaging_depth, | ||
average_container_depth=ophys_experiment_metadata._average_container_depth, # noqa E501 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does black really not split this line and the others like it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's been a ticket open for this on the black repository since 2018 and it hasn't been resolved yet.
psf/black#510
A black collaborator acknowledged the issue needs to be fixed in 2020
psf/black#1582 (comment)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
huh, if you fix it by hand, does black just revert it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it gets reverted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay, guess we'll live with it.
allensdk/test/brain_observatory/behavior/data_objects/metadata/test_behavior_ophys_metadata.py
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. One important comment about adding this value to the json.
...ervatory/behavior/data_objects/metadata/ophys_experiment_metadata/average_container_depth.py
Outdated
Show resolved
Hide resolved
...ervatory/behavior/data_objects/metadata/ophys_experiment_metadata/average_container_depth.py
Outdated
Show resolved
Hide resolved
...ervatory/behavior/data_objects/metadata/ophys_experiment_metadata/average_container_depth.py
Show resolved
Hide resolved
...ervatory/behavior/data_objects/metadata/ophys_experiment_metadata/average_container_depth.py
Outdated
Show resolved
Hide resolved
f2b35fe
to
a0a5484
Compare
sql query variable fix convert average_container_depth to int
a0a5484
to
6800f2a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
Addresses ticket # 2545
Summary: Get average of all
imaging_depths
and store it under a data attribute namedaverage_container_depth
on theophys_experiment_table
.AverageContainerDepth
AverageContainerDepth.from_lims
takes an ophys_experiment_id and queries for its associated container_id and gets all experiment_ids in that container. Joins the imaging_depth for all experiments. Takes average of all imaging_depths.AverageContainerDepth
toophys_experiment_metadata
,multi_plane_metadata
,behavior_ophys_metadata
, and associated schemas and namespaces.