Skip to content

Commit 7cca649

Browse files
authored
Revert "Import pose (#1225)" (#1245)
This reverts commit 783e7a3.
1 parent 783e7a3 commit 7cca649

File tree

6 files changed

+1
-181
lines changed

6 files changed

+1
-181
lines changed

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@
1717
- Set `probe_id` as `probe_description` when inserting from nwb file #1220
1818
- Default `AnalysisNwbfile.create` permissions are now 777 #1226
1919
- Position
20-
- Allow population of missing `PositionIntervalMap` entries during population of `DLCPoseEstimation` #1208
2120
- Allow population of missing `PositionIntervalMap` entries during population
2221
of `DLCPoseEstimation` #1208
23-
- Enable import of existing pose data to `ImportedPose` in position pipeline #1225
2422
- Spikesorting
2523
- Fix compatibility bug between v1 pipeline and `SortedSpikesGroup` unit
2624
filtering #1238
2725

2826
- Behavior
2927
- Implement pipeline for keypoint-moseq extraction of behavior syllables #1056
3028

29+
3130
## [0.5.4] (December 20, 2024)
3231

3332
### Infrastructure

docs/src/ForDevelopers/UsingNWB.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,6 @@ hdmf.common.table.DynamicTable </b>
256256
| PositionSource.SpatialSeries | id | int(nwbf.processing.behavior.position.\[index\]) (the enumerated index number) | | |
257257
| RawPosition.PosObject | raw_position_object_id | nwbf.processing.behavior.position.\[index\].object_id | | |
258258

259-
<b> NWBfile Location: nwbf.processing.behavior.PoseEstimation </br> Object type:
260-
(ndx_pose.PoseEstimation) </b>
261-
262-
| Spyglass Table | Key | NWBfile Location | Config option | Notes |
263-
| :--------------------------- | :--------------------: | -------------------------------------------------------------------------------: | ------------: | --------------------: |
264-
| ImportedPose | interval_list_name | pose_{PoseEstimation.name}_valid_times |
265-
| ImportedPose.BodyPart | pose | nwbf.processing.behavior.PoseEstimation.pose_estimation_series.name |
266-
267259
<b> NWBfile Location: nwbf.processing.video_files.video </br> Object type:
268260
pynwb.image.ImageSeries </b>
269261

pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ authors = [
1515
{ name = "Ryan Ly", email = "[email protected]" },
1616
{ name = "Daniel Gramling", email = "[email protected]" },
1717
{ name = "Chris Brozdowski", email = "[email protected]" },
18-
{ name = "Samuel Bray", email = "[email protected]" },
1918
]
2019
classifiers = [
2120
"Programming Language :: Python :: 3",
@@ -46,7 +45,6 @@ dependencies = [
4645
"ipympl",
4746
"matplotlib",
4847
"ndx_franklab_novela>=0.1.0",
49-
"ndx-pose",
5048
"non_local_detector",
5149
"numpy",
5250
"opencv-python",

src/spyglass/common/populate_all_common.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ def single_transaction_make(
8383
if table.__name__ == "PositionSource":
8484
# PositionSource only uses nwb_file_name - full calls redundant
8585
key_source = dj.U("nwb_file_name") & key_source
86-
if table.__name__ == "ImportedPose":
87-
key_source = Nwbfile()
8886

8987
for pop_key in (key_source & file_restr).fetch("KEY"):
9088
try:
@@ -118,7 +116,6 @@ def populate_all_common(
118116
List
119117
A list of keys for InsertError entries if any errors occurred.
120118
"""
121-
from spyglass.position.v1.imported_pose import ImportedPose
122119
from spyglass.spikesorting.imported import ImportedSpikeSorting
123120

124121
declare_all_merge_tables()
@@ -146,7 +143,6 @@ def populate_all_common(
146143
PositionSource, # Depends on Session
147144
VideoFile, # Depends on TaskEpoch
148145
StateScriptFile, # Depends on TaskEpoch
149-
ImportedPose, # Depends on Session
150146
],
151147
[
152148
RawPosition, # Depends on PositionSource

src/spyglass/position/position_merge.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from pandas import DataFrame
44

55
from spyglass.common.common_position import IntervalPositionInfo as CommonPos
6-
from spyglass.position.v1.imported_pose import ImportedPose
76
from spyglass.position.v1.position_dlc_pose_estimation import DLCPoseEstimation
87
from spyglass.position.v1.position_dlc_selection import DLCPosV1
98
from spyglass.position.v1.position_trodes_position import TrodesPosV1
@@ -15,7 +14,6 @@
1514
"IntervalPositionInfo": CommonPos,
1615
"DLCPosV1": DLCPosV1,
1716
"TrodesPosV1": TrodesPosV1,
18-
"ImportedPose": ImportedPose,
1917
"DLCPoseEstimation": DLCPoseEstimation,
2018
}
2119

@@ -67,17 +65,6 @@ class CommonPos(SpyglassMixin, dj.Part):
6765
-> CommonPos
6866
"""
6967

70-
class ImportedPose(SpyglassMixin, dj.Part):
71-
"""
72-
Table to pass-through upstream Pose information from NWB file
73-
"""
74-
75-
definition = """
76-
-> PositionOutput
77-
---
78-
-> ImportedPose
79-
"""
80-
8168
def fetch1_dataframe(self) -> DataFrame:
8269
"""Fetch a single dataframe from the merged table."""
8370
# proj replaces operator restriction to enable

src/spyglass/position/v1/imported_pose.py

Lines changed: 0 additions & 152 deletions
This file was deleted.

0 commit comments

Comments
 (0)