test: adapt tests to new margins

CNES · Jan 21, 2025 · 2703f0e · 2703f0e
1 parent 0d5bf1e
commit 2703f0e
Show file tree

Hide file tree

Showing 57 changed files with 16 additions and 2 deletions.
diff --git a/tests/applications/dense_matching/test_dense_matching_config.py b/tests/applications/dense_matching/test_dense_matching_config.py
@@ -146,7 +146,17 @@ def test_check_conf_with_error(
         "min_elevation_offset": 20,
         "max_elevation_offset": max_offset,  # should be > min
         "generate_confidence_intervals": confidence_intervals,
-        "loader_conf": {"pipeline": {"disparity": {}}},
+        "loader_conf": {
+            "input": {},
+            "pipeline": {
+                "matching_cost": {
+                    "matching_cost_method": "census",
+                    "window_size": 5,
+                    "subpix": 1,
+                },
+                "disparity": {"disparity_method": "wta"},
+            },
+        },
     }
     with pytest.raises(expected_error):
         _ = CensusMccnnSgm(conf)
diff --git a/tests/data/ref_output/classification_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/classification_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/cloud1_ref_pandora b/tests/data/ref_output/cloud1_ref_pandora
diff --git a/tests/data/ref_output/color_end2end_gizeh_fill.tif b/tests/data/ref_output/color_end2end_gizeh_fill.tif
diff --git a/tests/data/ref_output/color_end2end_paca_aux_filling.tif b/tests/data/ref_output/color_end2end_paca_aux_filling.tif
diff --git a/tests/data/ref_output/color_end2end_paca_aux_filling_1.tif b/tests/data/ref_output/color_end2end_paca_aux_filling_1.tif
diff --git a/tests/data/ref_output/color_end2end_paca_matches_filling.tif b/tests/data/ref_output/color_end2end_paca_matches_filling.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux.tif b/tests/data/ref_output/color_end2end_ventoux.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_egm96.tif b/tests/data/ref_output/color_end2end_ventoux_egm96.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_egm96_custom_geoid.tif b/tests/data/ref_output/color_end2end_ventoux_egm96_custom_geoid.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/color_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_no_srtm.tif b/tests/data/ref_output/color_end2end_ventoux_no_srtm.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_quality_stats.tif b/tests/data/ref_output/color_end2end_ventoux_quality_stats.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_with_color.tif b/tests/data/ref_output/color_end2end_ventoux_with_color.tif
diff --git a/tests/data/ref_output/color_end2end_ventoux_with_snap_to_img1.tif b/tests/data/ref_output/color_end2end_ventoux_with_snap_to_img1.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split.tif b/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/confidence_from_ambiguity1_end2end_ventoux_split_no_merging.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split.tif b/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/confidence_from_ambiguity2_end2end_ventoux_split_no_merging.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity_before_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_ambiguity_before_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_ambiguity_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_ambiguity_end2end_ventoux_no_srtm.tif b/tests/data/ref_output/confidence_from_ambiguity_end2end_ventoux_no_srtm.tif
diff --git a/tests/data/ref_output/confidence_from_intensity_std_before_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_intensity_std_before_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_intensity_std_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_intensity_std_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_risk_max_before_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_risk_max_before_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_risk_max_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_risk_max_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_risk_min_before_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_risk_min_before_end2end_ventoux.tif
diff --git a/tests/data/ref_output/confidence_from_risk_min_end2end_ventoux.tif b/tests/data/ref_output/confidence_from_risk_min_end2end_ventoux.tif
diff --git a/tests/data/ref_output/contributing_pair_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/contributing_pair_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/dsm_end2end_gizeh_fill.tif b/tests/data/ref_output/dsm_end2end_gizeh_fill.tif
diff --git a/tests/data/ref_output/dsm_end2end_paca_bulldozer.tif b/tests/data/ref_output/dsm_end2end_paca_bulldozer.tif
diff --git a/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif b/tests/data/ref_output/dsm_end2end_paca_matches_filling.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux.tif b/tests/data/ref_output/dsm_end2end_ventoux.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_egm96.tif b/tests/data/ref_output/dsm_end2end_ventoux_egm96.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_egm96_custom_geoid.tif b/tests/data/ref_output/dsm_end2end_ventoux_egm96_custom_geoid.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/dsm_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_no_srtm.tif b/tests/data/ref_output/dsm_end2end_ventoux_no_srtm.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_quality_stats.tif b/tests/data/ref_output/dsm_end2end_ventoux_quality_stats.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_with_classif.tif b/tests/data/ref_output/dsm_end2end_ventoux_with_classif.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_with_color.tif b/tests/data/ref_output/dsm_end2end_ventoux_with_color.tif
diff --git a/tests/data/ref_output/dsm_end2end_ventoux_with_snap_to_img1.tif b/tests/data/ref_output/dsm_end2end_ventoux_with_snap_to_img1.tif
diff --git a/tests/data/ref_output/dsm_mean_end2end_ventoux_quality_stats.tif b/tests/data/ref_output/dsm_mean_end2end_ventoux_quality_stats.tif
diff --git a/tests/data/ref_output/dsm_n_pts_end2end_ventoux_quality_stats.tif b/tests/data/ref_output/dsm_n_pts_end2end_ventoux_quality_stats.tif
diff --git a/tests/data/ref_output/dsm_pts_in_cell_end2end_ventoux_quality_stats.tif b/tests/data/ref_output/dsm_pts_in_cell_end2end_ventoux_quality_stats.tif
diff --git a/tests/data/ref_output/dsm_std_end2end_ventoux_quality_stats.tif b/tests/data/ref_output/dsm_std_end2end_ventoux_quality_stats.tif
diff --git a/tests/data/ref_output/epi_pc_X_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/epi_pc_X_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/epi_pc_Y_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/epi_pc_Y_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/epi_pc_Z_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/epi_pc_Z_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/filling_end2end_gizeh_fill.tif b/tests/data/ref_output/filling_end2end_gizeh_fill.tif
diff --git a/tests/data/ref_output/filling_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/filling_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/mask_end2end_gizeh_fill.tif b/tests/data/ref_output/mask_end2end_gizeh_fill.tif
diff --git a/tests/data/ref_output/mask_end2end_paca_bulldozer.tif b/tests/data/ref_output/mask_end2end_paca_bulldozer.tif
diff --git a/tests/data/ref_output/mask_end2end_paca_matches_filling.tif b/tests/data/ref_output/mask_end2end_paca_matches_filling.tif
diff --git a/tests/data/ref_output/mask_end2end_ventoux_no_elevation.tif b/tests/data/ref_output/mask_end2end_ventoux_no_elevation.tif
diff --git a/tests/data/ref_output/performance_map_end2end_ventoux_split.tif b/tests/data/ref_output/performance_map_end2end_ventoux_split.tif
diff --git a/tests/data/ref_output/performance_map_end2end_ventoux_split_no_merging.tif b/tests/data/ref_output/performance_map_end2end_ventoux_split_no_merging.tif
diff --git a/tests/pipelines/test_wrappers.py b/tests/pipelines/test_wrappers.py
@@ -29,6 +29,7 @@
 # Third party imports
 import pytest
 from pandora.img_tools import get_metadata
+from pandora.margins import Margins
 
 # CARS imports
 import cars.applications.dense_matching.dense_matching_tools as dense_match
@@ -111,8 +112,11 @@ def test_epipolar_pipeline(
     global_disp_min = -19
     global_disp_max = 15
 
+    # cumulative margins between sgm (40) and matching_cost (ws/2)
+    margins = Margins(42, 42, 42, 42)
+
     initial_margins = dense_match.get_margins(
-        global_disp_min, global_disp_max, corr_cfg
+        margins, global_disp_min, global_disp_max
     )
     pandora_margins = initial_margins["left_margin"].values