Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

Merge remote-tracking branch 'origin/main' into main

jon matthis8ceae7b2af0e
diff --cc freemocap/initialization.py
index a076dfe5,ef8cefad..6db0b4d4
--- a/freemocap/initialization.py
+++ b/freemocap/initialization.py
@@@ -147,13 -157,11 +157,13 @@@ def initialize(session, stage, board)
session.sessionPath = filepath/'Data'/session.sessionID
session.yamlPath = session.sessionPath/'{}_config.yaml'.format(session.sessionID) #path to the configuration yaml
- config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs
- recordingconfig.load_session_paths(session,config_settings) #add paths to session class
+ session.config_settings = recordingconfig.load_config_yaml(session.yamlPath) #config settings = paths and camera parameter inputs
+ recordingconfig.load_session_paths(session,session.config_settings) #add paths to session class
session.openPoseData_nCams_nFrames_nImgPts_XY = np.load(session.dataArrayPath/'openPoseData_nCams_nFrames_nImgPts_XY.npy')
-
+ calibrationFile = '{}_calibration.yaml'.format(session.sessionID)
+ session.cameraConfigFilePath = session.sessionPath/calibrationFile
+ session.cgroup = fmc_anipose.CameraGroup.load(session.cameraConfigFilePath)
if stage == 7:
diff --cc runme_fmc_staged.py
index bfd64dae,b01367bd..18a4e91e
--- a/runme_fmc_staged.py
+++ b/runme_fmc_staged.py
@@@ -1,5 -1,7 +1,7 @@@
-from freemocap import createvideo, initialization, runcams, calibrate, runopenpose, reconstruct3D, playskeleton, session
+from freemocap import createvideo, initialization, runcams, calibrate, fmc_openpose, reconstruct3D, playskeleton, session
+ from pathlib import Path
+ import os
from aniposelib.boards import CharucoBoard, Checkerboard
@@@ -10,10 -12,15 +12,16 @@@ import numpy as n
sesh = session.Session(useOpenPose=True,useDLC=False)
# %% Inputs to edit
-stage = 8 #set your starting stage here (stage = 1 will run the pipeline from webcams)
-sesh.debug = True
+stage = 1 #set your starting stage here (stage = 1 will run the pipeline from webcams)
+sesh.debug = False
+sesh.sessionID = '' #fill in if you are running from Stage 2 onwards
+ sesh.sessionID = '' #fill in if you are running from Stage 2 onwards
+ if not sesh.sessionID:
+ dataFolder = Path.cwd()/'Data'
+ subfolders = [ f.path for f in os.scandir(dataFolder) if f.is_dir() ] #copy-pasta from who knows where
+ sesh.sessionID = Path(subfolders[-1]).stem #grab the name of the last folder in the list of subfolders
+
board = CharucoBoard(7, 5,
#square_length=1, # here, in mm but any unit works (JSM NOTE - just using '1' so resulting units will be in 'charuco squarelenghts`)
#marker_length=.8,