diff --git a/Pose2Sim/Demo/S00_Demo_Session/Config.toml b/Pose2Sim/Demo/S00_Demo_Session/Config.toml index 67cb336..97fc094 100644 --- a/Pose2Sim/Demo/S00_Demo_Session/Config.toml +++ b/Pose2Sim/Demo/S00_Demo_Session/Config.toml @@ -27,7 +27,7 @@ frame_range = [] # For example [10,300], or [] for all frames exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' +## Only taken into account if want to use marker augmentation participant_height = 1.7 # m participant_mass = 70 # kg @@ -94,8 +94,7 @@ calibration_type = 'convert' # 'convert' or 'calculate' [pose] pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII #With mediapipe: BLAZEPOSE. #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. #With deeplabcut: CUSTOM. See example at the end of the file. diff --git a/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/Config.toml b/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/Config.toml index ca9978c..c74dcb6 100644 --- a/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/Config.toml +++ b/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/Config.toml @@ -27,7 +27,7 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. diff --git a/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T00_StaticTrial/Config.toml b/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T00_StaticTrial/Config.toml index ca9978c..c74dcb6 100644 --- a/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T00_StaticTrial/Config.toml +++ b/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T00_StaticTrial/Config.toml @@ -27,7 +27,7 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. diff --git a/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T01_BalancingTrial/Config.toml b/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T01_BalancingTrial/Config.toml index ca9978c..c74dcb6 100644 --- a/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T01_BalancingTrial/Config.toml +++ b/Pose2Sim/Demo/S00_Demo_Session/S00_P00_Participant/S00_P00_T01_BalancingTrial/Config.toml @@ -27,7 +27,7 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. diff --git a/Pose2Sim/Demo/S01_Empty_Session/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/Config.toml index 80b0696..fb87b93 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/Config.toml @@ -27,7 +27,7 @@ frame_range = [] # For example [10,300], or [] for all frames exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' +## Only taken into account if want to use marker augmentation participant_height = 1.7 # m participant_mass = 70 # kg @@ -95,7 +95,6 @@ calibration_type = 'convert' # 'convert' or 'calculate' [pose] pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED #With mediapipe: BLAZEPOSE. #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. #With deeplabcut: CUSTOM. See example at the end of the file. diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T00_StaticTrial/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T00_StaticTrial/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T00_StaticTrial/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T00_StaticTrial/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T01_MotionTrial1/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T01_MotionTrial1/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T01_MotionTrial1/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T01_MotionTrial1/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T02_MotionTrial2/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T02_MotionTrial2/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T02_MotionTrial2/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P00_Participant0/S01_P00_T02_MotionTrial2/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T00_StaticTrial/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T00_StaticTrial/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T00_StaticTrial/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T00_StaticTrial/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T01_MotionTrial1/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T01_MotionTrial1/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T01_MotionTrial1/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T01_MotionTrial1/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T02_MotionTrial2/Config.toml b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T02_MotionTrial2/Config.toml index d9d4ed2..c74dcb6 100644 --- a/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T02_MotionTrial2/Config.toml +++ b/Pose2Sim/Demo/S01_Empty_Session/S01_P01_Participant1/S01_P01_T02_MotionTrial2/Config.toml @@ -9,7 +9,7 @@ # If a parameter is not found here, Pose2Sim will look for its value in the # Config.toml file of the level above. This way, you can set global # instructions for the Session and alter them for specific Participants or Trials. -# +# # If you wish to overwrite a parameter for a specific trial or participant, # edit its Config.toml file by uncommenting its key (e.g., [project]) # and editing its value (e.g., frame_range = [10,300]). Or else, uncomment @@ -27,9 +27,9 @@ # exclude_from_batch = [] # List of trials to be excluded from batch analysis, ['', 'etc']. # e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P00_Participant/S00_P00_T01_BalancingTrial'] +## Only taken into account if want to use marker augmentation # participant_height = 1.7 # m # participant_mass = 70 # kg -## Only taken into account if pose_model is 'BODY_25_AUGMENTED' ## Take heart, calibration is not that complicated once you get the hang of it! @@ -95,8 +95,7 @@ # [pose] # pose_framework = 'openpose' # 'openpose', 'mediapipe', 'alphapose', 'deeplabcut' -# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, - # BODY_25_AUGMENTED, BODY_25B_AUGMENTED +# pose_model = 'BODY_25B' #With openpose: BODY_25B, BODY_25, BODY_135, COCO, MPII, # #With mediapipe: BLAZEPOSE. # #With alphapose: HALPE_26, HALPE_68, HALPE_136, COCO_133. # #With deeplabcut: CUSTOM. See example at the end of the file. @@ -163,7 +162,7 @@ # [opensim] -# static_trial = ['S01_P00_Participant0/S01_P00_T00_StaticTrial'] +# static_trial = ['S00_P00_Participant/S00_P00_T00_StaticTrial'] # # If this Config.toml file is at the Trial level, set to true or false (lowercase); # # At the Participant level, specify the name of the static trial folder name, e.g. ['S00_P00_T00_StaticTrial']; # # At the Session level, add participant subdirectory, e.g. ['S00_P00_Participant/S00_P00_T00_StaticTrial', 'S00_P01_Participant/S00_P00_T00_StaticTrial'] diff --git a/Pose2Sim/Pose2Sim.py b/Pose2Sim/Pose2Sim.py index 4abaf8b..f4aeea3 100644 --- a/Pose2Sim/Pose2Sim.py +++ b/Pose2Sim/Pose2Sim.py @@ -373,188 +373,12 @@ def triangulation(config=None): logging.info(f"Triangulation of 2D points for {seq_name}, for {frames}.") logging.info("---------------------------------------------------------------------") logging.info(f"\nProject directory: {project_dir}") - if config_dict.get('pose').get('pose_model') == 'BODY_25_AUGMENTED': - triangulation_filt_AUGMENTED(config_dict) - else: - triangulate_all(config_dict) - - end = time.time() - logging.info(f'Triangulation took {end-start:.2f} s.') - -def triangulation_AUGMENTED(config=None): - ''' - Augmentation process for marker data. - - config can be a dictionary, - or the directory path of a trial, participant, or session, - or the function can be called without an argument, in which case the config directory is the current one. - ''' - from Pose2Sim.triangulation import triangulate_all - from Pose2Sim.augmenter import augmentTRC - - # Determine the level at which the function is called (session:3, participant:2, trial:1) - level, config_dicts = read_config_files(config) - - if type(config)==dict: - config_dict = config_dicts[0] - if config_dict.get('project').get('project_dir') == None: - raise ValueError('Please specify the project directory in config_dict:\n \ - config_dict.get("project").update({"project_dir":""})') - - # Set up logging - session_dir = os.path.realpath(os.path.join(config_dicts[0].get('project').get('project_dir'), '..', '..')) - setup_logging(session_dir) - - # Batch process all trials - for config_dict in config_dicts: - start = time.time() - project_dir = os.path.realpath(config_dict.get('project').get('project_dir')) - seq_name = os.path.basename(project_dir) - frame_range = config_dict.get('project').get('frame_range') - frames = ["all frames" if frame_range == [] else f"frames {frame_range[0]} to {frame_range[1]}"][0] - - logging.info("\n\n---------------------------------------------------------------------") - logging.info(f"Triangulation of 2D points for {seq_name}, for {frames}.") - logging.info("---------------------------------------------------------------------") - logging.info(f"\nProject directory: {project_dir}") - + triangulate_all(config_dict) end = time.time() logging.info(f'Triangulation took {end-start:.2f} s.') - - level, config_dicts = read_config_files(config) - - if type(config) == dict: - config_dict = config_dicts[0] - if config_dict.get('project').get('project_dir') is None: - raise ValueError('Please specify the project directory in config_dict:\n \ - config_dict.get("project").update({"project_dir":""})') - - session_dir = os.path.realpath(os.path.join(config_dicts[0].get('project').get('project_dir'), '..', '..')) - setup_logging(session_dir) - - for config_dict in config_dicts: - start = time.time() - project_dir = os.path.realpath(config_dict.get('project').get('project_dir')) - seq_name = os.path.basename(project_dir) - frame_range = config_dict.get('project').get('frame_range') - frames = ["all frames" if frame_range == [] else f"frames {frame_range[0]} to {frame_range[1]}"][0] - - logging.info("\n\n---------------------------------------------------------------------") - logging.info(f"Augmentation process for {seq_name}, for {frames}.") - logging.info("---------------------------------------------------------------------") - logging.info(f"\nProject directory: {project_dir}") - - augmentTRC(config_dict) - - end = time.time() - logging.info(f'Augmentation took {end - start:.2f} s.') - -def triangulation_filt_AUGMENTED(config=None): - ''' - Augmentation process for marker data. - - config can be a dictionary, - or the directory path of a trial, participant, or session, - or the function can be called without an argument, in which case the config directory is the current one. - ''' - from Pose2Sim.triangulation import triangulate_all - from Pose2Sim.filtering import filter_all - from Pose2Sim.augmenter import augmentTRC - - # Determine the level at which the function is called (session:3, participant:2, trial:1) - level, config_dicts = read_config_files(config) - - if type(config)==dict: - config_dict = config_dicts[0] - if config_dict.get('project').get('project_dir') == None: - raise ValueError('Please specify the project directory in config_dict:\n \ - config_dict.get("project").update({"project_dir":""})') - - # Set up logging - session_dir = os.path.realpath(os.path.join(config_dicts[0].get('project').get('project_dir'), '..', '..')) - setup_logging(session_dir) - - # Batch process all trials - for config_dict in config_dicts: - start = time.time() - project_dir = os.path.realpath(config_dict.get('project').get('project_dir')) - seq_name = os.path.basename(project_dir) - frame_range = config_dict.get('project').get('frame_range') - frames = ["all frames" if frame_range == [] else f"frames {frame_range[0]} to {frame_range[1]}"][0] - - logging.info("\n\n---------------------------------------------------------------------") - logging.info(f"Triangulation of 2D points for {seq_name}, for {frames}.") - logging.info("---------------------------------------------------------------------") - logging.info(f"\nProject directory: {project_dir}") - - triangulate_all(config_dict) - - end = time.time() - logging.info(f'Triangulation took {end-start:.2f} s.') - - # Determine the level at which the function is called (session:3, participant:2, trial:1) - level, config_dicts = read_config_files(config) - - if type(config)==dict: - config_dict = config_dicts[0] - if config_dict.get('project').get('project_dir') == None: - raise ValueError('Please specify the project directory in config_dict:\n \ - config_dict.get("project").update({"project_dir":""})') - - # Set up logging - session_dir = os.path.realpath(os.path.join(config_dicts[0].get('project').get('project_dir'), '..', '..')) - setup_logging(session_dir) - - # Set up logging - session_dir = os.path.realpath(os.path.join(config_dicts[0].get('project').get('project_dir'), '..', '..')) - setup_logging(session_dir) - - # Batch process all trials - for config_dict in config_dicts: - project_dir = os.path.realpath(config_dict.get('project').get('project_dir')) - seq_name = os.path.basename(project_dir) - frame_range = config_dict.get('project').get('frame_range') - frames = ["all frames" if frame_range == [] else f"frames {frame_range[0]} to {frame_range[1]}"][0] - - logging.info("\n\n---------------------------------------------------------------------") - logging.info(f"Filtering 3D coordinates for {seq_name}, for {frames}.") - logging.info("---------------------------------------------------------------------") - logging.info(f"\nProject directory: {project_dir}") - - filter_all(config_dict) - - level, config_dicts = read_config_files(config) - - if type(config) == dict: - config_dict = config_dicts[0] - if config_dict.get('project').get('project_dir') is None: - raise ValueError('Please specify the project directory in config_dict:\n \ - config_dict.get("project").update({"project_dir":""})') - - session_dir = os.path.realpath(os.path.join(config_dicts[0].get('project').get('project_dir'), '..', '..')) - setup_logging(session_dir) - - for config_dict in config_dicts: - start = time.time() - project_dir = os.path.realpath(config_dict.get('project').get('project_dir')) - seq_name = os.path.basename(project_dir) - frame_range = config_dict.get('project').get('frame_range') - frames = ["all frames" if frame_range == [] else f"frames {frame_range[0]} to {frame_range[1]}"][0] - - logging.info("\n\n---------------------------------------------------------------------") - logging.info(f"Augmentation process for {seq_name}, for {frames}.") - logging.info("---------------------------------------------------------------------") - logging.info(f"\nProject directory: {project_dir}") - - augmentTRC(config_dict) - - end = time.time() - logging.info(f'Augmentation took {end - start:.2f} s.') - - - + def filtering(config=None): ''' diff --git a/Pose2Sim/skeletons.py b/Pose2Sim/skeletons.py index 5792c64..233fa4f 100644 --- a/Pose2Sim/skeletons.py +++ b/Pose2Sim/skeletons.py @@ -77,46 +77,6 @@ BODY_25B = Node("CHip", id=None, children=[ ]), ]) -'''BODY_25B_AUGMENTED (full-body without hands, experimental, from OpenPose) -https://github.com/CMU-Perceptual-Computing-Lab/openpose_train/blob/master/experimental_models/README.md''' -BODY_25B_AUGMENTED = Node("CHip", id=None, children=[ - Node("RHip", id=12, children=[ - Node("RKnee", id=14, children=[ - Node("RAnkle", id=16, children=[ - Node("RBigToe", id=22, children=[ - Node("RSmallToe", id=23), - ]), - Node("RHeel", id=24), - ]), - ]), - ]), - Node("LHip", id=11, children=[ - Node("LKnee", id=13, children=[ - Node("LAnkle", id=15, children=[ - Node("LBigToe", id=19, children=[ - Node("LSmallToe", id=20), - ]), - Node("LHeel", id=21), - ]), - ]), - ]), - Node("Neck", id=17, children=[ - Node("Head", id=18, children=[ - Node("Nose", id=0), - ]), - Node("RShoulder", id=6, children=[ - Node("RElbow", id=8, children=[ - Node("RWrist", id=10), - ]), - ]), - Node("LShoulder", id=5, children=[ - Node("LElbow", id=7, children=[ - Node("LWrist", id=9), - ]), - ]), - ]), -]) - '''BODY_25 (full-body without hands, standard, from OpenPose) https://github.com/CMU-Perceptual-Computing-Lab/openpose/tree/master/models''' @@ -156,45 +116,6 @@ BODY_25 = Node("CHip", id=8, children=[ ]), ]) -'''BODY_25_AUGMENTED (full-body without hands, standard, from OpenPose) -https://github.com/CMU-Perceptual-Computing-Lab/openpose/tree/master/models''' -BODY_25_AUGMENTED = Node("CHip", id=8, children=[ - Node("RHip", id=9, children=[ - Node("RKnee", id=10, children=[ - Node("RAnkle", id=11, children=[ - Node("RBigToe", id=22, children=[ - Node("RSmallToe", id=23), - ]), - Node("RHeel", id=24), - ]), - ]), - ]), - Node("LHip", id=12, children=[ - Node("LKnee", id=13, children=[ - Node("LAnkle", id=14, children=[ - Node("LBigToe", id=19, children=[ - Node("LSmallToe", id=20), - ]), - Node("LHeel", id=21), - ]), - ]), - ]), - Node("Neck", id=17, children=[ - Node("Nose", id=0), - Node("RShoulder", id=2, children=[ - Node("RElbow", id=3, children=[ - Node("RWrist", id=4), - ]), - ]), - Node("LShoulder", id=5, children=[ - Node("LElbow", id=6, children=[ - Node("LWrist", id=7), - ]), - ]), - ]), -]) - - '''BODY_135 (full-body with hands and face, experimental, from OpenPose) https://github.com/CMU-Perceptual-Computing-Lab/openpose_train/blob/master/experimental_models/README.md)''' BODY_135 = Node("CHip", id=None, children=[