From 2c6f66635f5d686f0c89d7f7024d6dbb5660688b Mon Sep 17 00:00:00 2001 From: scisofttools Date: Wed, 26 Jun 2019 19:45:46 -0400 Subject: [PATCH 1/3] Update installation.md --- docs/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index c1729414b8..e4915a216a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -13,7 +13,7 @@ Anaconda is perhaps the easiest way to install Python and additional packages ac ## Step 3: Easy install for Windows and MacOS: use our supplied Anaconda environments. Please click here: https://github.com/AlexEMG/DeepLabCut/blob/master/conda-environments/README.md - +test **For LINUX ONLY, follow below!** (Ubuntu 16.04 or 18.04 LTS): From 1b58eca83a45f94192a96cd9803e98d249bc9093 Mon Sep 17 00:00:00 2001 From: scisofttools Date: Wed, 26 Jun 2019 19:46:33 -0400 Subject: [PATCH 2/3] Revert "Update installation.md" This reverts commit 2c6f66635f5d686f0c89d7f7024d6dbb5660688b. --- docs/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index e4915a216a..c1729414b8 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -13,7 +13,7 @@ Anaconda is perhaps the easiest way to install Python and additional packages ac ## Step 3: Easy install for Windows and MacOS: use our supplied Anaconda environments. Please click here: https://github.com/AlexEMG/DeepLabCut/blob/master/conda-environments/README.md -test + **For LINUX ONLY, follow below!** (Ubuntu 16.04 or 18.04 LTS): From af1f4501e86187e416bbbfb04d27c975b5fd539f Mon Sep 17 00:00:00 2001 From: scisofttools Date: Mon, 1 Jul 2019 11:14:56 -0400 Subject: [PATCH 3/3] test --- deeplabcut/pose_estimation_3d/triangulation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deeplabcut/pose_estimation_3d/triangulation.py b/deeplabcut/pose_estimation_3d/triangulation.py index efdbaf8c9a..a625ab2e83 100644 --- a/deeplabcut/pose_estimation_3d/triangulation.py +++ b/deeplabcut/pose_estimation_3d/triangulation.py @@ -165,7 +165,7 @@ def triangulate(config,video_path,videotype='avi',filterpredictions=True,filtert points_cam1_undistort[low_likelihood_frames] = np.nan,np.nan points_cam1_undistort = np.expand_dims(points_cam1_undistort, axis=1) - points_cam2_undistort = np.array([dataFrame_camera2_undistort[scorer_cam1][bp]['x'].values[:], dataFrame_camera2_undistort[scorer_cam2][bp]['y'].values[:]]) + points_cam2_undistort = np.array([dataFrame_camera2_undistort[scorer_cam3][bp]['x'].values[:], dataFrame_camera2_undistort[scorer_cam2][bp]['y'].values[:]]) points_cam2_undistort = points_cam2_undistort.T # For cam2 camera: Assign nans to x and y values of a bodypart where the likelihood is less than pvalue