Merge branch 'master' into interval_list_types

LorenFrankLab · Jan 10, 2024 · 1aded0b · 1aded0b
2 parents 3ea81cc + 582e993
commit 1aded0b
Show file tree

Hide file tree

Showing 65 changed files with 9,050 additions and 5,463 deletions.
diff --git a/.gitignore b/.gitignore
@@ -151,6 +151,12 @@ temp_nwb/*s
 *.json
 *.gz
 *.pdf
+*.lock
+*.npz
+*.xz
+*.zip
+*.pb
+*.pem
 dj_local_conf*
 !dj_local_conf_example.json
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Add `cautious_delete` to Mixin class, initial implementation. #711
 - Add `deprecation_factory` to facilitate table migration. #717
 - Add Spyglass logger. #730
+- IntervalList: Add secondary key `pipeline` #742
 
 ### Pipelines
 
@@ -23,7 +24,13 @@
 - Position:
     - Refactor input validation in DLC pipeline. #688
     - DLC path handling from config, and normalize naming convention. #722
-- IntervalList: Add secondary key `pipeline` #742
+- 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)
 

diff --git a/environment.yml b/environment.yml
@@ -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

diff --git a/notebooks/12_LFP.ipynb → notebooks/30_LFP.ipynb b/notebooks/12_LFP.ipynb → notebooks/30_LFP.ipynb
diff --git a/notebooks/31_Extract_Mark_Indicators.ipynb b/notebooks/31_Extract_Mark_Indicators.ipynb
diff --git a/notebooks/14_Theta.ipynb → notebooks/31_Theta.ipynb b/notebooks/14_Theta.ipynb → notebooks/31_Theta.ipynb
-Original file 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 @@