[pipelines] removed DistortionCalibration node from default pipelines

alicevision · May 22, 2023 · e895808 · e895808
1 parent a9befd9
commit e895808
Show file tree

Hide file tree

Showing 2 changed files with 178 additions and 201 deletions.
diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg
@@ -1,105 +1,94 @@
 {
     "header": {
-        "pipelineVersion": "2.2", 
-        "releaseVersion": "2023.1.0",
-        "fileVersion": "1.1", 
-        "template": true, 
+        "pipelineVersion": "2.2",
+        "releaseVersion": "2023.2.0-develop",
+        "fileVersion": "1.1",
+        "template": true,
         "nodesVersions": {
-            "ExportAnimatedCamera": "2.0", 
-            "FeatureMatching": "2.0", 
-            "DistortionCalibration": "2.0", 
-            "CameraInit": "9.0", 
-            "ImageMatching": "2.0", 
-            "FeatureExtraction": "1.1", 
+            "ExportAnimatedCamera": "2.0",
+            "Publish": "1.2",
             "StructureFromMotion": "3.0",
-            "Publish": "1.2"
+            "FeatureExtraction": "1.1",
+            "FeatureMatching": "2.0",
+            "CameraInit": "9.0",
+            "ImageMatching": "2.0"
         }
-    }, 
+    },
     "graph": {
-        "DistortionCalibration_1": {
-            "inputs": {
-                "input": "{CameraInit_1.output}"
-            }, 
-            "nodeType": "DistortionCalibration", 
-            "position": [
-                200, 
-                160
-            ]
-        }, 
         "ImageMatching_1": {
+            "nodeType": "ImageMatching",
+            "position": [
+                400,
+                0
+            ],
             "inputs": {
-                "nbNeighbors": 10, 
-                "nbMatches": 5, 
-                "input": "{FeatureExtraction_1.input}", 
+                "input": "{FeatureExtraction_1.input}",
                 "featuresFolders": [
                     "{FeatureExtraction_1.output}"
-                ]
-            }, 
-            "nodeType": "ImageMatching", 
+                ],
+                "nbMatches": 5,
+                "nbNeighbors": 10
+            }
+        },
+        "FeatureExtraction_1": {
+            "nodeType": "FeatureExtraction",
             "position": [
-                400, 
+                200,
                 0
-            ]
-        }, 
-        "FeatureExtraction_1": {
+            ],
             "inputs": {
                 "input": "{CameraInit_1.output}"
-            }, 
-            "nodeType": "FeatureExtraction", 
+            }
+        },
+        "StructureFromMotion_1": {
+            "nodeType": "StructureFromMotion",
             "position": [
-                200, 
+                800,
                 0
-            ]
-        }, 
-        "StructureFromMotion_1": {
+            ],
             "inputs": {
-                "minAngleForLandmark": 0.5, 
-                "minNumberOfObservationsForTriangulation": 3, 
-                "describerTypes": "{FeatureMatching_1.describerTypes}", 
-                "input": "{FeatureMatching_1.input}", 
-                "featuresFolders": "{FeatureMatching_1.featuresFolders}", 
+                "input": "{FeatureMatching_1.input}",
+                "featuresFolders": "{FeatureMatching_1.featuresFolders}",
                 "matchesFolders": [
                     "{FeatureMatching_1.output}"
-                ], 
-                "minInputTrackLength": 5, 
-                "minAngleForTriangulation": 1.0
-            }, 
-            "nodeType": "StructureFromMotion", 
+                ],
+                "describerTypes": "{FeatureMatching_1.describerTypes}",
+                "minInputTrackLength": 5,
+                "minNumberOfObservationsForTriangulation": 3,
+                "minAngleForTriangulation": 1.0,
+                "minAngleForLandmark": 0.5
+            }
+        },
+        "ExportAnimatedCamera_1": {
+            "nodeType": "ExportAnimatedCamera",
             "position": [
-                800, 
+                1000,
                 0
-            ]
-        }, 
-        "ExportAnimatedCamera_1": {
+            ],
             "inputs": {
                 "input": "{StructureFromMotion_1.output}"
-            }, 
-            "nodeType": "ExportAnimatedCamera", 
-            "position": [
-                1000, 
-                0
-            ]
-        }, 
+            }
+        },
         "CameraInit_1": {
-            "inputs": {}, 
-            "nodeType": "CameraInit", 
+            "nodeType": "CameraInit",
             "position": [
-                0, 
+                0,
                 0
-            ]
-        }, 
+            ],
+            "inputs": {}
+        },
         "FeatureMatching_1": {
-            "inputs": {
-                "describerTypes": "{FeatureExtraction_1.describerTypes}", 
-                "imagePairsList": "{ImageMatching_1.output}", 
-                "input": "{DistortionCalibration_1.outSfMData}", 
-                "featuresFolders": "{ImageMatching_1.featuresFolders}"
-            }, 
-            "nodeType": "FeatureMatching", 
+            "nodeType": "FeatureMatching",
             "position": [
-                600, 
+                600,
                 0
-            ]
+            ],
+            "inputs": {
+                "input": "{ImageMatching_1.input}",
+                "featuresFolders": "{ImageMatching_1.featuresFolders}",
+                "imagePairsList": "{ImageMatching_1.output}",
+                "describerTypes": "{FeatureExtraction_1.describerTypes}"
+            }
         },
         "Publish_1": {
             "nodeType": "Publish",