forgot an os.listdir -> could not find calib when run from trial + version update

2024-04-26 22:06:03 +02:00 · 2024-04-26 22:06:03 +02:00 · 9a60007a5a
commit 9a60007a5a
parent aaa56985e1
33 changed files with 39 additions and 38 deletions
--- a/Pose2Sim/Pose2Sim.py
+++ b/Pose2Sim/Pose2Sim.py
@ -53,7 +53,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = "0.4"
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/S00_Demo_BatchSession/tests.py
+++ b/Pose2Sim/S00_Demo_BatchSession/tests.py
@ -46,7 +46,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.8'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/AlphaPose_to_OpenPose.py
+++ b/Pose2Sim/Utilities/AlphaPose_to_OpenPose.py
@ -27,7 +27,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2023, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/Blazepose_runsave.py
+++ b/Pose2Sim/Utilities/Blazepose_runsave.py
@ -41,7 +41,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2023, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/DLC_to_OpenPose.py
+++ b/Pose2Sim/Utilities/DLC_to_OpenPose.py
@ -31,7 +31,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/init.py
+++ b/Pose2Sim/Utilities/init.py
@ -3,5 +3,5 @@

 import sys

-__version__ = '0.6'
+__version__ = "0.8.2"
 VERSION = __version__
--- a/Pose2Sim/Utilities/c3d_to_trc.py
+++ b/Pose2Sim/Utilities/c3d_to_trc.py
@ -28,7 +28,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/calib_easymocap_to_toml.py
+++ b/Pose2Sim/Utilities/calib_easymocap_to_toml.py
@ -32,7 +32,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/calib_from_checkerboard.py
+++ b/Pose2Sim/Utilities/calib_from_checkerboard.py
@ -37,7 +37,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/calib_qca_to_toml.py
+++ b/Pose2Sim/Utilities/calib_qca_to_toml.py
@ -31,7 +31,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/calib_toml_to_easymocap.py
+++ b/Pose2Sim/Utilities/calib_toml_to_easymocap.py
@ -29,7 +29,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/calib_toml_to_opencap.py
+++ b/Pose2Sim/Utilities/calib_toml_to_opencap.py
@ -31,7 +31,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/calib_toml_to_qca.py
+++ b/Pose2Sim/Utilities/calib_toml_to_qca.py
@ -31,7 +31,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/json_display_with_img.py
+++ b/Pose2Sim/Utilities/json_display_with_img.py
@ -37,7 +37,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/json_display_without_img.py
+++ b/Pose2Sim/Utilities/json_display_without_img.py
@ -35,7 +35,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_Zup_to_Yup.py
+++ b/Pose2Sim/Utilities/trc_Zup_to_Yup.py
@ -27,7 +27,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_combine.py
+++ b/Pose2Sim/Utilities/trc_combine.py
@ -31,7 +31,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2022, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_desample.py
+++ b/Pose2Sim/Utilities/trc_desample.py
@ -27,7 +27,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_filter.py
+++ b/Pose2Sim/Utilities/trc_filter.py
@ -48,7 +48,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_from_easymocap.py
+++ b/Pose2Sim/Utilities/trc_from_easymocap.py
@ -44,7 +44,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.7.2'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_from_mot_osim.py
+++ b/Pose2Sim/Utilities/trc_from_mot_osim.py
@ -35,7 +35,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = "0.4"
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_gaitevents.py
+++ b/Pose2Sim/Utilities/trc_gaitevents.py
@ -51,7 +51,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_plot.py
+++ b/Pose2Sim/Utilities/trc_plot.py
@ -36,7 +36,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/Utilities/trc_to_c3d.py
+++ b/Pose2Sim/Utilities/trc_to_c3d.py
@ -27,7 +27,7 @@ __author__ = "HunMin Kim, David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["HuMin Kim, David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.8'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/init.py
+++ b/Pose2Sim/init.py
@ -4,7 +4,7 @@
 import sys


-__version__ = '0.6'
+__version__ = "0.8.2"
 VERSION = __version__


@ -13,7 +13,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/calibration.py
+++ b/Pose2Sim/calibration.py
@ -57,7 +57,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = "0.4"
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
@ -602,6 +602,7 @@ def calibrate_intrinsics(calib_dir, intrinsics_config_dict):

        # calculate intrinsics
        img = cv2.imread(str(img_path))
+        objpoints = np.array(objpoints)
        ret_cam, mtx, dist, rvecs, tvecs = cv2.calibrateCamera(objpoints, imgpoints, img.shape[1::-1], 
                                    None, None, flags=(cv2.CALIB_FIX_K3 + cv2.CALIB_FIX_PRINCIPAL_POINT))
        h, w = [np.float32(i) for i in img.shape[:-1]]
--- a/Pose2Sim/common.py
+++ b/Pose2Sim/common.py
@ -34,7 +34,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Maya-Mocap"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/filtering.py
+++ b/Pose2Sim/filtering.py
@ -44,7 +44,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/markerAugmentation.py
+++ b/Pose2Sim/markerAugmentation.py
@ -38,7 +38,7 @@ __author__ = "Antoine Falisse, adapted by HunMin Kim"
 __copyright__ = "Copyright 2022, OpenCap"
 __credits__ = ["Antoine Falisse", "HunMin Kim"]
 __license__ = "Apache-2.0 License"
-__version__ = '0.5'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/personAssociation.py
+++ b/Pose2Sim/personAssociation.py
@ -54,7 +54,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
@ -560,7 +560,7 @@ def recap_tracking(config, error=0, nb_cams_excluded=0):
    # if batch
    session_dir = os.path.realpath(os.path.join(project_dir, '..', '..'))
    # if single trial
-    session_dir = os.getcwd() if not 'Config.toml' in session_dir else session_dir
+    session_dir = session_dir if 'Config.toml' in os.listdir(session_dir) else os.getcwd()
    multi_person = config.get('project').get('multi_person')
    likelihood_threshold_association = config.get('personAssociation').get('likelihood_threshold_association')
    tracked_keypoint = config.get('personAssociation').get('single_person').get('tracked_keypoint')
@ -622,7 +622,7 @@ def track_2d_all(config):
    # if batch
    session_dir = os.path.realpath(os.path.join(project_dir, '..', '..'))
    # if single trial
-    session_dir = os.getcwd() if not 'Config.toml' in session_dir else session_dir
+    session_dir = session_dir if 'Config.toml' in os.listdir(session_dir) else os.getcwd()
    multi_person = config.get('project').get('multi_person')
    pose_model = config.get('pose').get('pose_model')
    tracked_keypoint = config.get('personAssociation').get('single_person').get('tracked_keypoint')
--- a/Pose2Sim/skeletons.py
+++ b/Pose2Sim/skeletons.py
@ -31,7 +31,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/synchronization.py
+++ b/Pose2Sim/synchronization.py
@ -53,7 +53,7 @@ __author__ = "David Pagnon, HunMin Kim"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.8'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
--- a/Pose2Sim/triangulation.py
+++ b/Pose2Sim/triangulation.py
@ -59,7 +59,7 @@ __author__ = "David Pagnon"
 __copyright__ = "Copyright 2021, Pose2Sim"
 __credits__ = ["David Pagnon"]
 __license__ = "BSD 3-Clause License"
-__version__ = '0.6'
+__version__ = "0.8.2"
 __maintainer__ = "David Pagnon"
 __email__ = "contact@david-pagnon.com"
 __status__ = "Development"
@ -311,7 +311,7 @@ def recap_triangulate(config, error, nb_cams_excluded, keypoints_names, cam_excl
    # if batch
    session_dir = os.path.realpath(os.path.join(project_dir, '..', '..'))
    # if single trial
-    session_dir = os.getcwd() if not 'Config.toml' in os.listdir(session_dir) else session_dir
+    session_dir = session_dir if 'Config.toml' in os.listdir(session_dir) else os.getcwd()
    calib_dir = [os.path.join(session_dir, c) for c in os.listdir(session_dir) if 'calib' in c.lower()][0]
    calib_file = glob.glob(os.path.join(calib_dir, '*.toml'))[0] # lastly created calibration file
    calib = toml.load(calib_file)
@ -696,7 +696,7 @@ def triangulate_all(config):
    # if batch
    session_dir = os.path.realpath(os.path.join(project_dir, '..', '..'))
    # if single trial
-    session_dir = os.getcwd() if not 'Config.toml' in os.listdir(session_dir) else session_dir
+    session_dir = session_dir if 'Config.toml' in os.listdir(session_dir) else os.getcwd()
    multi_person = config.get('project').get('multi_person')
    pose_model = config.get('pose').get('pose_model')
    frame_range = config.get('project').get('frame_range')