Merge pull request #214 from stanfordnmbl/dev

Dev
stanfordnmbl · Nov 7, 2024 · 9d139da · 9d139da
2 parents 48c1374 + 3cbcc36
commit 9d139da
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 1 deletion.
diff --git a/CameraIntrinsics/iPhone17,1/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,1/Deployed/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,1/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,1/Deployed_720_60fps/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,2/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,2/Deployed/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,2/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,2/Deployed_720_60fps/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,3/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,3/Deployed/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,3/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,3/Deployed_720_60fps/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,4/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,4/Deployed/cameraIntrinsics.pickle
diff --git a/CameraIntrinsics/iPhone17,4/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,4/Deployed_720_60fps/cameraIntrinsics.pickle
diff --git a/utils.py b/utils.py
@@ -809,7 +809,7 @@ def getMotionData(trial_id,session_path,simplePath=False):
     resultTags = [res['tag'] for res in trial['results']]
 
     # get marker data
-    if 'ik_results' in resultTags:
+    if 'marker_data' in resultTags:
         markerFolder = os.path.join(session_path,'MarkerData','PostAugmentation',trial_name)
         if simplePath:
             markerFolder = os.path.join(session_path,'MarkerData')