Merge pull request #2055 from alicevision/mug/trackingSfMParams

[pipelines] cameraTracking: change StructureFromMotion parameters
alicevision · Jun 15, 2023 · 6ac9948 · 6ac9948
2 parents 98a6bab + 4ee5cd6
commit 6ac9948
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/meshroom/nodes/aliceVision/StructureFromMotion.py b/meshroom/nodes/aliceVision/StructureFromMotion.py
@@ -176,7 +176,7 @@ class StructureFromMotion(desc.AVCommandLineNode):
                         'This leads to more stable results while computations are not too expensive, as there is little data.\n'
                         'Past this number, the bundle adjustment will only be performed once for N added cameras.',
             value=30,
-            range=(1, 100, 1),
+            range=(0, 100, 1),
             uid=[0],
             advanced=True
         ),
@@ -186,7 +186,7 @@ class StructureFromMotion(desc.AVCommandLineNode):
             description='Maximum number of cameras that can be added before the bundle adjustment has to be performed again.\n'
                         'This prevents adding too much data at once without performing the bundle adjustment.',
             value=30,
-            range=(1, 100, 1),
+            range=(0, 100, 1),
             uid=[0],
             advanced=True
         ),

diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg
@@ -5,30 +5,30 @@
         "fileVersion": "1.1",
         "template": true,
         "nodesVersions": {
+            "ImageMatching": "2.0",
+            "ConvertSfMFormat": "2.0",
+            "ExportDistortion": "1.0",
+            "SfMTransfer": "2.1",
+            "KeyframeSelection": "4.1",
             "FeatureExtraction": "1.2",
-            "CameraInit": "9.0",
+            "DistortionCalibration": "3.0",
+            "Meshing": "7.0",
+            "MeshDecimate": "1.0",
             "DepthMap": "4.0",
+            "MeshFiltering": "3.0",
             "SfMTriangulation": "1.0",
-            "ExportDistortion": "1.0",
-            "DepthMapFilter": "3.0",
-            "DistortionCalibration": "3.0",
-            "PrepareDenseScene": "3.0",
-            "KeyframeSelection": "4.1",
-            "Publish": "1.3",
+            "Texturing": "6.0",
             "StructureFromMotion": "3.1",
-            "CheckerboardDetection": "1.0",
-            "ImageMatchingMultiSfM": "1.0",
+            "CameraInit": "9.0",
             "ApplyCalibration": "1.0",
-            "Texturing": "6.0",
+            "PrepareDenseScene": "3.0",
+            "Publish": "1.3",
             "ExportAnimatedCamera": "2.0",
-            "Meshing": "7.0",
-            "MeshDecimate": "1.0",
+            "DepthMapFilter": "3.0",
             "ScenePreview": "1.0",
-            "ConvertSfMFormat": "2.0",
-            "MeshFiltering": "3.0",
-            "FeatureMatching": "2.0",
-            "ImageMatching": "2.0",
-            "SfMTransfer": "2.1"
+            "ImageMatchingMultiSfM": "1.0",
+            "CheckerboardDetection": "1.0",
+            "FeatureMatching": "2.0"
         }
     },
     "graph": {
@@ -330,6 +330,9 @@
                     "{FeatureMatching_2.output}"
                 ],
                 "describerTypes": "{FeatureMatching_3.describerTypes}",
+                "nbFirstUnstableCameras": 0,
+                "maxImagesPerGroup": 0,
+                "bundleAdjustmentMaxOutliers": -1,
                 "minInputTrackLength": 5,
                 "minNumberOfObservationsForTriangulation": 3,
                 "minAngleForTriangulation": 1.0,
@@ -416,4 +419,4 @@
             }
         }
     }
-}
+}