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

Add Z drift metrics to imaging_no_curation #3

Merged
merged 113 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
9914121
Fix format
kabilar Oct 28, 2022
9195511
Merge branch 'main' of https://github.com/datajoint/element-calcium-i…
kabilar Nov 10, 2022
754665b
Merge branch 'main' of https://github.com/datajoint/element-calcium-i…
kabilar Nov 12, 2022
1f9c9b1
add extract in processinmethod & add checks in processingparamset
tdincer Nov 30, 2022
ebb5b3a
Merge branch 'datajoint:main' into extract
tdincer Nov 30, 2022
8f67a0c
extract: motion correction with suite2p
tdincer Dec 13, 2022
f2f5a30
save motion corrected matrix into mat file
tdincer Dec 13, 2022
eafda21
add run extract
tdincer Dec 13, 2022
809b25e
add processing_time
tdincer Dec 13, 2022
12de225
Curation table
tdincer Dec 13, 2022
8aa80ad
MotionCorrection table
tdincer Dec 13, 2022
ed19738
add comment
tdincer Dec 13, 2022
eca73b8
ingest Fluorescence table
tdincer Dec 13, 2022
8a662a6
Bruker PrairieView import added to imaging
kushalbakshi Dec 13, 2022
67cc3b3
code cleaning
tdincer Dec 14, 2022
c6f3d2f
small refactoring
tdincer Dec 14, 2022
032a2be
Updates from review for bruker support
kushalbakshi Dec 14, 2022
44dcbf1
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
f6c41e2
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
af583f9
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
329a7b6
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
5a216e5
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
cc24a49
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
671e0ab
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
9eb2550
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
39f10fd
Update element_calcium_imaging/imaging.py
tdincer Dec 14, 2022
9ff7b96
make mask_zpix nullable
tdincer Dec 14, 2022
03effe9
fix missing quote, change fetch to fetch1 in Processing
tdincer Dec 14, 2022
ec9fc85
make mask_center_z nullable
tdincer Dec 14, 2022
5906e96
add extract in concepts.md
tdincer Dec 14, 2022
eb5585a
add extract use instructions
tdincer Dec 14, 2022
6b03ead
bump version
tdincer Dec 14, 2022
467caad
add condition to use extract loader at motioncorrection
tdincer Dec 14, 2022
72cc828
Update docs/src/tutorials.md
tdincer Dec 14, 2022
eea2cf7
Update docs/src/tutorials.md
tdincer Dec 14, 2022
b99e966
Update docs/src/tutorials.md
tdincer Dec 14, 2022
4241cad
misc
tdincer Dec 14, 2022
6f39e60
normalize all variants
tdincer Dec 14, 2022
1081e1b
Update docs/src/index.md
tdincer Dec 14, 2022
268b172
add EXTRACT in README
tdincer Dec 14, 2022
0a7719f
Merge pull request #108 from tdincer/extract
kabilar Dec 14, 2022
5f5c8ab
Merge branch 'main' of https://github.com/datajoint/element-calcium-i…
kushalbakshi Dec 15, 2022
b3b6c07
Update CHANGELOG + version
kushalbakshi Dec 15, 2022
442487a
Merge pull request #109 from kushalbakshi/main
kabilar Dec 15, 2022
361a570
bugfix, store output_dir as relative path
Jan 10, 2023
39e6ccd
Merge pull request #110 from ttngu207/main
tdincer Jan 10, 2023
e9e3a16
Error fix in `ScanInfo` for PrairieView scans
kushalbakshi Jan 10, 2023
30877fb
Inserting as a list in `Field` table
kushalbakshi Jan 10, 2023
87d3abb
Code edited for brevity + clarity
kushalbakshi Jan 10, 2023
d8fbf67
Update tutorials.md
tdincer Jan 10, 2023
269bf56
Broken link fix
tdincer Jan 10, 2023
1382aec
Update element_calcium_imaging/scan.py
kushalbakshi Jan 10, 2023
684718a
Merge pull request #112 from tdincer/main
Jan 10, 2023
6a3cc79
Merge pull request #111 from kushalbakshi/main
Jan 10, 2023
b5d9d52
caiman and suite2p installation through pip
tdincer Jan 11, 2023
7f47d65
add readers
tdincer Jan 11, 2023
b0ef3b5
handle multi-channel tiff image before running CaImAn
ttngu207 Jan 31, 2023
524ab80
Merge pull request #7 from ttngu207/main
tdincer Jan 31, 2023
0c3271f
handling multi-channel for run_caiman
ttngu207 Jan 31, 2023
cca4786
Merge pull request #8 from ttngu207/main
tdincer Jan 31, 2023
9a8e2ad
bugfix
ttngu207 Jan 31, 2023
29a9c7b
Merge pull request #9 from ttngu207/main
tdincer Jan 31, 2023
6b3bddc
fix scanimage interleaved
tdincer Jan 31, 2023
bb2abc2
small fixes
tdincer Jan 31, 2023
8128025
fix back
tdincer Jan 31, 2023
b51427e
Merge pull request #114 from tdincer/main
Jan 31, 2023
66570dd
bugfix, detect and infer empty-string outputdir
ttngu207 Feb 8, 2023
b7ead12
Merge pull request #115 from ttngu207/main
tdincer Feb 8, 2023
13709fb
Fix link
kabilar Feb 14, 2023
7a7872f
Merge pull request #116 from kabilar/main
tdincer Feb 14, 2023
d62276b
Update CHANGELOG
kushalbakshi Feb 14, 2023
63cc372
Merge pull request #117 from kushalbakshi/main
kabilar Feb 14, 2023
1b26832
Update version.py
kushalbakshi Feb 14, 2023
e5a60ca
Merge pull request #118 from kushalbakshi/main
CBroz1 Feb 14, 2023
7fba82c
Add notebook rendering
CBroz1 Feb 16, 2023
7e45dbc
Add and observe linters
CBroz1 Feb 16, 2023
670e5cf
Update changelog, add typing suggestions
CBroz1 Feb 16, 2023
6d88b62
Add issue templates and code of conduct from element ephys
CBroz1 Feb 17, 2023
f571c7c
Apply suggestions from code review
CBroz1 Feb 20, 2023
8a6c70c
Remove allen notebook on docs compose
CBroz1 Feb 20, 2023
41e3f1a
Apply suggestions from code review
CBroz1 Feb 21, 2023
df42de1
Merge pull request #120 from CBroz1/main
kabilar Feb 21, 2023
35432e5
fix Tuple ()->[] bug
sidhulyalkar Feb 23, 2023
26e022b
Merge pull request #121 from sidhulyalkar/main
tdincer Feb 23, 2023
46e3915
update changelog and version
sidhulyalkar Feb 23, 2023
8270bea
Update changelog
sidhulyalkar Feb 23, 2023
7b6ea5c
Merge pull request #122 from sidhulyalkar/main
tdincer Feb 23, 2023
b3fd1fb
Update css
kabilar Mar 2, 2023
1f80fb8
Merge pull request #123 from kabilar/main
tdincer Mar 2, 2023
f561965
Add requirement for `ipywidgets`
kushalbakshi Mar 8, 2023
96bbcc3
Merge pull request #125 from kushalbakshi/main
kabilar Mar 8, 2023
52cfffc
Update compose file
kabilar Mar 9, 2023
1f0b549
Update changelog
kabilar Mar 9, 2023
605f91b
Merge pull request #126 from kabilar/main
kushalbakshi Mar 9, 2023
4c2b78c
Update version for element-interface requirement
kushalbakshi Apr 6, 2023
97d1106
Merge pull request #129 from kushalbakshi/main
kabilar Apr 6, 2023
2de3ba9
Fix docs tutorials in dark mode
kushalbakshi Apr 28, 2023
45fbd33
Update docs/src/tutorials/index.md
kushalbakshi Apr 28, 2023
49013dc
Update CHANGELOG.md
kushalbakshi Apr 28, 2023
66e5944
Merge pull request #132 from kushalbakshi/main
kabilar Apr 28, 2023
aa1e53c
Merge branch 'main' of https://github.com/dj-sciops/lulab_element-cal…
kushalbakshi May 2, 2023
a234189
Add cannabinoid schema
kushalbakshi Jul 18, 2023
3aaf940
Add Z drift calculation schema
kushalbakshi Jul 19, 2023
e42e8fa
Fix formatting in `ZDriftParamSet` definition comment
kushalbakshi Jul 19, 2023
9edbb96
Update foreign key reference
kushalbakshi Jul 19, 2023
ac0b484
Remove "processing_method" from ZDriftParamSet
kushalbakshi Jul 19, 2023
5ca521e
Modify key_source for ZDriftMetrics
kushalbakshi Jul 19, 2023
7ed4e90
classmethod -> property for key_source
kushalbakshi Jul 19, 2023
6fa531c
Add primary keys of key_source to table definition
kushalbakshi Jul 19, 2023
c0a878e
Add `get_zstack_files` function
kushalbakshi Aug 1, 2023
c09b3e9
Bugfix in fetching image file path
kushalbakshi Aug 1, 2023
6709903
Remove key_source property from `ZDriftMetrics`
kushalbakshi Aug 1, 2023
ba7d1ac
Edit comments and docstrings for z drift
kushalbakshi Aug 10, 2023
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
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''

---

## Bug Report

### Description

A clear and concise description of what is the overall operation that is intended to be
performed that resulted in an error.

### Reproducibility
Include:
- OS (WIN | MACOS | Linux)
- DataJoint Element Version
- MySQL Version
- MySQL Deployment Strategy (local-native | local-docker | remote)
- Minimum number of steps to reliably reproduce the issue
- Complete error stack as a result of evaluating the above steps

### Expected Behavior
A clear and concise description of what you expected to happen.

### Screenshots
If applicable, add screenshots to help explain your problem.

### Additional Research and Context
Add any additional research or context that was conducted in creating this report.

For example:
- Related GitHub issues and PR's either within this repository or in other relevant
repositories.
- Specific links to specific lines or a focus within source code.
- Relevant summary of Maintainers development meetings, milestones, projects, etc.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: DataJoint Contribution Guideline
url: https://datajoint.com/docs/community/contribute/
about: Please make sure to review the DataJoint Contribution Guidelines
57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
name: Feature request
about: Suggest an idea for a new feature
title: ''
labels: 'enhancement'
assignees: ''

---

## Feature Request

### Problem

A clear and concise description how this idea has manifested and the context. Elaborate
on the need for this feature and/or what could be improved. Ex. I'm always frustrated
when [...]

### Requirements

A clear and concise description of the requirements to satisfy the new feature. Detail
what you expect from a successful implementation of the feature. Ex. When using this
feature, it should [...]

### Justification

Provide the key benefits in making this a supported feature. Ex. Adding support for this
feature would ensure [...]

### Alternative Considerations

Do you currently have a work-around for this? Provide any alternative solutions or
features you've considered.

### Related Errors
Add any errors as a direct result of not exposing this feature.

Please include steps to reproduce provided errors as follows:
- OS (WIN | MACOS | Linux)
- DataJoint Element Version
- MySQL Version
- MySQL Deployment Strategy (local-native | local-docker | remote)
- Minimum number of steps to reliably reproduce the issue
- Complete error stack as a result of evaluating the above steps

### Screenshots
If applicable, add screenshots to help explain your feature.

### Additional Research and Context
Add any additional research or context that was conducted in creating this feature request.

For example:
- Related GitHub issues and PR's either within this repository or in other relevant
repositories.
- Specific links to specific lines or a focus within source code.
- Relevant summary of Maintainers development meetings, milestones, projects, etc.
- Any additional supplemental web references or links that would further justify this
feature request.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@ ENV/
dj_local_conf.json
dj_local_conf_old.json
workflow_calcium_imaging/
temp*

# docs
/docs/site
/docs/src/tutorials/*ipynb

# emacs
**/*~
**/#*#
**/.#*
**/.#*
17 changes: 17 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Markdown Linter configuration for docs
# https://github.com/DavidAnson/markdownlint
# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md
MD009: false # permit trailing spaces
MD007: false # List indenting - permit 4 spaces
MD013:
line_length: "88" # Line length limits
tables: false # disable for tables
headings: false # disable for headings
MD030: false # Number of spaces after a list
MD033: # HTML elements allowed
allowed_elements:
- "figure"
- "figcaption"
MD034: false # Permit bare URLs
MD031: false # Spacing w/code blocks. Conflicts with `??? Note` and code tab styling
MD046: false # Spacing w/code blocks. Conflicts with `??? Note` and code tab styling
58 changes: 58 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
default_stages: [commit, push]
exclude: (^.github/|^docs/|^images/)

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files # prevent giant files from being committed
- id: requirements-txt-fixer
- id: mixed-line-ending
args: ["--fix=lf"]
description: Forces to replace line ending by the UNIX 'lf' character.

# black
- repo: https://github.com/psf/black
rev: 22.12.0
hooks:
- id: black
- id: black-jupyter
args:
- --line-length=88

# isort
- repo: https://github.com/pycqa/isort
rev: 5.11.2
hooks:
- id: isort
args: ["--profile", "black"]
description: Sorts imports in an alphabetical order

# flake8
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
hooks:
- id: flake8
args: # arguments to configure flake8
# making isort line length compatible with black
- "--max-line-length=88"
- "--max-complexity=18"
- "--select=B,C,E,F,W,T4,B9"

# these are errors that will be ignored by flake8
# https://www.flake8rules.com/rules/{code}.html
- "--ignore=E203,E501,W503,W605,E402"
# E203 - Colons should not have any space before them.
# Needed for list indexing
# E501 - Line lengths are recommended to be no greater than 79 characters.
# Needed as we conform to 88
# W503 - Line breaks should occur after the binary operator.
# Needed because not compatible with black
# W605 - a backslash-character pair that is not a valid escape sequence now
# generates a DeprecationWarning. This will eventually become a SyntaxError.
# Needed because we use \d as an escape sequence
# E402 - Place module level import at the top.
# Needed to prevent circular import error
46 changes: 45 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,56 @@
# Changelog

Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
[Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.

## [0.5.6] - 2023-04-28

+ Fix - `.ipynb` output in tutorials is not visible in dark mode.
+ Fix - typos in docstrings.

## [0.5.5] - 2023-04-06

+ Update - Bump `element-interface` requirement to `0.5.1`.

## [0.5.4] - 2023-03-08

+ Add - Requirement for `ipywidgets`
+ Update - Docker Compose file for docs release

## [0.5.3] - 2023-02-23

+ Add - spelling, markdown, and pre-commit config files
+ Add - Notebook rendering to docs

## [0.5.2] - 2023-01-11

+ Bugfix - fix errors in ingesting single-plane PrairieView scans into `ScanInfo`
+ Add - Optional installation of caiman and suite2p through pip

## [0.5.1] - 2022-12-15

+ Add - Imports for prairieview loader

## [0.5.0] - 2022-12-14

+ Add - Cell extraction with EXTRACT package

## [0.4.2] - 2022-11-02

+ Bugfix - Add plotting package to the requirements to generate the figures
+ Add - Scan date parser from nd2 files

## [0.4.1] - 2022-10-28

+ Update - Bump version to trigger PyPI release to revert updates from incorrect tag

## [0.4.0] - 2022-10-28

+ Add - New schema `imaging_report` to compute and store figures from results
+ Add - Widget to display figures

## [0.3.0] - 2022-10-07

+ Add - Reader for `Bruker PrairieView` acquisition system

## [0.2.2] - 2022-09-28
Expand Down Expand Up @@ -56,6 +93,13 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
+ Add - `scan` and `imaging` modules
+ Add - Readers for `ScanImage`, `ScanBox`, `Suite2p`, `CaImAn`

[0.5.6]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.6
[0.5.5]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.5
[0.5.4]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.4
[0.5.3]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.3
[0.5.2]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.2
[0.5.1]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.1
[0.5.0]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.5.0
[0.4.2]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.4.2
[0.4.1]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.4.1
[0.4.0]: https://github.com/datajoint/element-calcium-imaging/releases/tag/0.4.0
Expand Down
Loading