diff --git a/cfgs/fitnmerge/default.yaml b/cfgs/fitnmerge/default.yaml index c7c7a7e3..3867c3db 100644 --- a/cfgs/fitnmerge/default.yaml +++ b/cfgs/fitnmerge/default.yaml @@ -55,7 +55,7 @@ fitting: var2d: -1.0 # depends on the detector ransac_th: 0.75 min_percentage_inliers: 0.9 - n_jobs: 1 + n_jobs: 4 ############################## # merging config diff --git a/limap/base/camera.cc b/limap/base/camera.cc index de73f6d3..e44593ff 100644 --- a/limap/base/camera.cc +++ b/limap/base/camera.cc @@ -244,14 +244,12 @@ double Camera::uncertainty(double depth, double var2d) const { Camera::Camera(py::dict dict) { // model id int model_id_loaded; - ASSIGN_PYDICT_ITEM(dict, model_id_loaded, int); + ASSIGN_PYDICT_ITEM_TKEY(dict, model_id, model_id_loaded, int); model_id = static_cast(model_id_loaded); // params - std::vector params_loaded; - ASSIGN_PYDICT_ITEM(dict, params_loaded, std::vector); - THROW_CHECK_EQ(params_loaded.size(), params.size()); - params = params_loaded; + ASSIGN_PYDICT_ITEM(dict, params, std::vector); + THROW_CHECK(VerifyParams()); // other fields ASSIGN_PYDICT_ITEM(dict, camera_id, int);