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

Decoding pipeline #731

Merged
merged 117 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from 101 commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
6b9b66f
Add non-local detector and remove replay_trajectory_classification
edeno Oct 19, 2023
f12ec07
Merge branch 'master' into decoding-pipeline
edeno Nov 7, 2023
9cc8984
Reorganize
edeno Nov 30, 2023
ac14e19
Merge branch 'master' into decoding-pipeline
edeno Nov 30, 2023
d2eb290
Fix formatting and imports
edeno Nov 30, 2023
a861483
Merge branch 'master' into decoding-pipeline
edeno Dec 14, 2023
69dc63d
Update .gitignore
edeno Dec 18, 2023
d4ccca3
Merge branch 'master' into decoding-pipeline
edeno Dec 18, 2023
e9e0870
Remove because of circular import
edeno Dec 18, 2023
d0d5e9d
Merge branch 'master' into decoding-pipeline
edeno Dec 19, 2023
654db5f
Merge branch 'master' into decoding-pipeline
edeno Dec 20, 2023
5787a04
Fix name of parameter
edeno Dec 20, 2023
61018fe
Handle case where ther is only one interval
edeno Dec 20, 2023
4516618
Fix settings
edeno Dec 20, 2023
d4148eb
Handle single interval
edeno Dec 20, 2023
d101f53
Merge branch 'master' into decoding-pipeline
edeno Dec 20, 2023
a165c8d
Merge branch 'master' into decoding-pipeline
edeno Dec 20, 2023
34dec96
Merge branch 'master' into decoding-pipeline
edeno Dec 20, 2023
1a18770
Merge branch 'master' into decoding-pipeline
edeno Dec 20, 2023
6282392
Merge branch 'master' into decoding-pipeline
edeno Dec 20, 2023
554eb8d
Merge branch 'master' into decoding-pipeline
edeno Dec 21, 2023
bc7c4f1
from_unit_dict does not exist in 0.98.2 of spike interface
edeno Dec 21, 2023
2dfd1f8
Simplify call
edeno Dec 21, 2023
3edb261
Update for SpikeSorting merge table and add spyglass mixin
edeno Dec 21, 2023
711fba7
Merge branch 'master' into decoding-pipeline
edeno Dec 21, 2023
1aa4589
Merge branch 'master' into decoding-pipeline
edeno Dec 21, 2023
4b5771c
Fix dependencies
edeno Dec 21, 2023
baca5fc
Fix merge conflict
edeno Dec 21, 2023
4d4c080
Update src/spyglass/decoding/v1/clusterless.py
edeno Dec 21, 2023
947c763
Update src/spyglass/decoding/v1/clusterless.py
edeno Dec 21, 2023
f9bc8d3
Update src/spyglass/decoding/v1/clusterless.py
edeno Dec 21, 2023
9e40004
Update src/spyglass/decoding/v1/clusterless.py
edeno Dec 21, 2023
6c17c7c
Apply suggestions from code review
edeno Dec 21, 2023
8008280
Remove unused imports and format
edeno Dec 21, 2023
78af559
Add saving of waveform features
edeno Dec 22, 2023
ad9f7df
Don't store electrodes, full waveforms, waveform mean
edeno Dec 22, 2023
851a32a
Fix spike times and add convenience method
edeno Dec 22, 2023
8e8aebf
Add spike location and some formatting
edeno Dec 22, 2023
84503d4
Merge branch 'master' into decoding-pipeline
edeno Dec 22, 2023
bdb99ee
Remove circular import
edeno Dec 22, 2023
9dbb790
Fix dict expansion
edeno Dec 22, 2023
72aa0f9
Initial working clusterless pipeline
edeno Dec 22, 2023
bfe16ba
Add position group
edeno Dec 23, 2023
7e533e1
Rename classifier to decoding
edeno Dec 23, 2023
a1dff9c
Handle encoding and decoding intervals
edeno Dec 23, 2023
284ebdd
Put old files under v0, try/except for old decoding package
edeno Dec 23, 2023
f6612ab
Rename visualization and remove from v0
edeno Dec 23, 2023
a9d14b6
Place parameters and position group in core.py
edeno Dec 23, 2023
386027b
Add sorted spikes decoding
edeno Dec 23, 2023
17b1abb
Add objects to init for convenience
edeno Dec 23, 2023
34c65ec
Remove unused imports
edeno Dec 23, 2023
6cb5a27
Fix fetching of spike times
edeno Dec 23, 2023
6105b55
Insert into merge table
edeno Dec 23, 2023
c8cf692
Update CHANGELOG.md
edeno Dec 23, 2023
17c050a
Function for removing decoding outputs not in DecodingOutput
edeno Dec 24, 2023
25c75ab
Fix name
edeno Dec 24, 2023
11457e5
Add draft of tutorials and rearrange notebooks
edeno Dec 24, 2023
3b60150
Fix config loading
edeno Dec 26, 2023
cf4de2c
Add 1D decoding and some notes on estimate_parameters kwarg
edeno Dec 27, 2023
74d7b1f
Update 43_Decoding_SortedSpikes.ipynb
edeno Dec 27, 2023
f7cf9fc
Remove old decoding notebook
edeno Dec 27, 2023
5828bea
Merge branch 'master' into decoding-pipeline
edeno Dec 27, 2023
011191e
Save initial conditions and discrete transitions
edeno Dec 27, 2023
5d6dc19
Apply suggestions from code review
edeno Jan 2, 2024
a37c51c
Be more specific with import error
edeno Jan 2, 2024
a304472
Remove unneeded comments
edeno Jan 2, 2024
b0ba523
Remove incorrect dimension name
edeno Jan 2, 2024
ba28472
Project merge_id from SpikeSortingOutput for clarity
edeno Jan 2, 2024
c9a0cdc
Update src/spyglass/decoding/v0/clusterless.py
edeno Jan 2, 2024
d8e883e
Update src/spyglass/decoding/v0/clusterless.py
edeno Jan 2, 2024
74a50eb
Update src/spyglass/decoding/v0/clusterless.py
edeno Jan 2, 2024
3fcbc48
Fix linting
edeno Jan 2, 2024
987e024
Merge branch 'decoding-pipeline' of https://github.com/LorenFrankLab/…
edeno Jan 2, 2024
87c340a
Update notebooks
edeno Jan 2, 2024
5247948
Ignore .pem
edeno Jan 3, 2024
18b3e57
Add session as a primary key for Groups
edeno Jan 3, 2024
12e8360
Add some helper methods
edeno Jan 3, 2024
799fbbe
Update notebooks
edeno Jan 3, 2024
0179414
Update README.md
edeno Jan 3, 2024
c483988
Update pyscripts
edeno Jan 3, 2024
2fc0e9d
Update 42_Decoding_Clusterless.ipynb
edeno Jan 3, 2024
f780bd6
Update CHANGELOG.md
edeno Jan 3, 2024
6c0a2f9
Add fetch and insert
edeno Jan 3, 2024
c918569
Merge branch 'master' into decoding-pipeline
edeno Jan 3, 2024
4999c78
Simplify class conversion
edeno Jan 3, 2024
935fde8
Do the dictionary conversion of class for the user
edeno Jan 3, 2024
b14ac06
Update CHANGELOG.md
edeno Jan 3, 2024
b6ed2ad
Merge branch 'master' into decoding-pipeline
edeno Jan 3, 2024
6ff7181
Update .gitignore
edeno Jan 3, 2024
9e527ce
Use methods in populate
edeno Jan 3, 2024
18d7af2
Avoid fetching interval range if not needed
edeno Jan 3, 2024
53fb7ef
Generalize finding class from modules
edeno Jan 4, 2024
2d5fa9c
Use args/kwargs
edeno Jan 4, 2024
33fbf61
Simplify tuple unpacking
edeno Jan 4, 2024
c8b4efb
Make decoding kwargs nullable
edeno Jan 4, 2024
1b06dac
Add function for get_recording and get_sorting to the spikesorting me…
samuelbray32 Jan 4, 2024
28d44f7
make decoding waveform features agnostic to spikesorting source
samuelbray32 Jan 4, 2024
7eed4af
Merge branch 'decoding-pipeline' of https://github.com/LorenFrankLab/…
samuelbray32 Jan 4, 2024
c267cba
Fix spelling
edeno Jan 5, 2024
a891747
Use fetch1_dataframe for position
edeno Jan 5, 2024
74c927d
Use self instead of class
edeno Jan 5, 2024
bd4211e
Update src/spyglass/decoding/v1/sorted_spikes.py
edeno Jan 8, 2024
fa3c13d
Be more careful about populating select keys
edeno Jan 8, 2024
3807db6
Make more readable/remove unused imports
edeno Jan 8, 2024
3995e24
Save classifier
edeno Jan 8, 2024
d14f40f
Clean up saved model paths
edeno Jan 8, 2024
560a22a
add function load_linear_position_info
samuelbray32 Jan 8, 2024
3ead87e
Update src/spyglass/decoding/v1/sorted_spikes.py
edeno Jan 8, 2024
08c4c20
Update 41_Extracting_Clusterless_Waveform_Features.py
edeno Jan 9, 2024
158f4bc
Update docstring
edeno Jan 9, 2024
e4ae6d9
Merge branch 'master' into decoding-pipeline
edeno Jan 9, 2024
4ec0f50
Apply suggestions from code review
edeno Jan 10, 2024
c01baad
Update src/spyglass/decoding/v1/clusterless.py
edeno Jan 10, 2024
17dad85
Update src/spyglass/decoding/v1/clusterless.py
edeno Jan 10, 2024
34600d2
Fix linting
edeno Jan 10, 2024
6d25232
Fix syntax
edeno Jan 10, 2024
7358ced
Rename variable to avoid confusion
edeno Jan 10, 2024
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ temp_nwb/*s
*.json
*.gz
*.pdf
*.lock
*.npz
*.xz
*.zip
*.pb
*.pem
dj_local_conf*
!dj_local_conf_example.json

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
- Position:
- Refactor input validation in DLC pipeline. #688
- DLC path handling from config, and normalize naming convention. #722
- Decoding:
- Add `decoding` pipeline V1. #731
- Add a table to store the decoding results #731
- Use the new `non_local_detector` package for decoding #731
- Allow multiple spike waveform features for clusterelss decoding #731
- Reorder notebooks #731

## [0.4.3] (November 7, 2023)

Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ dependencies:
- position_tools
- numpy<1.24
- track_linearization>=2.3
- replay_trajectory_classification
- ripple_detection
- trajectory_analysis_tools
- non_local_detector
- matplotlib
- seaborn
- bottleneck
Expand Down
File renamed without changes.
1,299 changes: 0 additions & 1,299 deletions notebooks/31_Extract_Mark_Indicators.ipynb

This file was deleted.

File renamed without changes.
Loading
Loading