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

Query simplifications, edits in table explanations, some code refactoring #82

Merged
merged 25 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c1585c9
introduce a new activity table design to allow new traces e.g. from f…
tdincer Jun 29, 2022
8f38698
Merge branch 'datajoint:main' into main
tdincer Jun 29, 2022
b75f1c0
Merge branch 'main' of https://github.com/datajoint/element-calcium-i…
tdincer Jun 29, 2022
4fbe41a
address Dimitri's comments
tdincer Jun 29, 2022
32f95a7
Merge branch 'main' of https://github.com/tdincer/element-calcium-ima…
tdincer Jun 29, 2022
15af911
table join optimization
tdincer Jun 30, 2022
3706a11
revert mistakes
tdincer Jun 30, 2022
ffede4a
Merge branch 'main' into main
tdincer Aug 15, 2022
9b1d577
Update element_calcium_imaging/imaging_withpostprocessing.py
tdincer Aug 15, 2022
67fef56
ProcessingMethod description line break
tdincer Aug 15, 2022
8c193b5
Merge branch 'main' of https://github.com/tdincer/element-calcium-ima…
tdincer Aug 15, 2022
6dc0f1d
param -> caiman_params
tdincer Aug 15, 2022
7808aba
Update element_calcium_imaging/imaging_withpostprocessing.py
tdincer Aug 15, 2022
c86e412
refine curation definition
tdincer Aug 15, 2022
4f32085
Update element_calcium_imaging/imaging_withpostprocessing.py
tdincer Aug 15, 2022
5ca5d45
query optimization & misc
tdincer Aug 15, 2022
8f0b075
remove Activity key source
tdincer Aug 16, 2022
ed49692
rename withpostprocessing to fissa
tdincer Aug 16, 2022
8d4f745
Merge branch 'datajoint:main' into main
tdincer Sep 1, 2022
2c9d515
merge conflict
tdincer Sep 27, 2022
167a7d2
remove imaging_fissa
tdincer Sep 28, 2022
409df42
Merge branch 'main' of https://github.com/tdincer/element-calcium-ima…
tdincer Sep 28, 2022
b4099c9
changelog
tdincer Sep 28, 2022
e3b221b
add tag links
tdincer Sep 28, 2022
ca55762
Update CHANGELOG.md
tdincer Sep 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions element_calcium_imaging/imaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,7 @@ def make(self, key):
ProcessingTask * ProcessingParamSet * ProcessingMethod * scan.Scan & key
).fetch1("processing_method")

image_files = (
ProcessingTask * scan.Scan * scan.ScanInfo * scan.ScanInfo.ScanFile
& key
).fetch("file_path")
image_files = (scan.ScanInfo.ScanFile & key).fetch("file_path")
image_files = [
find_full_path(get_imaging_root_data_dir(), image_file)
for image_file in image_files
Expand Down
5 changes: 1 addition & 4 deletions element_calcium_imaging/imaging_no_curation.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,7 @@ def make(self, key):
ProcessingTask * ProcessingParamSet * ProcessingMethod * scan.Scan & key
).fetch1("processing_method")

image_files = (
ProcessingTask * scan.Scan * scan.ScanInfo * scan.ScanInfo.ScanFile
& key
).fetch("file_path")
image_files = (scan.ScanInfo.ScanFile & key).fetch("file_path")
image_files = [
find_full_path(get_imaging_root_data_dir(), image_file)
for image_file in image_files
Expand Down
Loading