cars 1.0.0a3__cp311-cp311-win_amd64.whl → 1.0.0a4__cp311-cp311-win_amd64.whl

cars/pipelines/parameters/advanced_parameters.py

@@ -30,8 +30,7 @@ import rasterio as rio
 from json_checker import And, Checker, OptionalKey, Or
 
 from cars.pipelines.parameters import advanced_parameters_constants as adv_cst
-from cars.pipelines.parameters import depth_map_inputs
-from cars.pipelines.parameters import depth_map_inputs_constants as depth_cst
+from cars.pipelines.parameters import dsm_inputs
 from cars.pipelines.parameters import dsm_inputs_constants as dsm_cst
 from cars.pipelines.parameters import sensor_inputs
 from cars.pipelines.parameters import sensor_inputs_constants as sens_cst
@@ -39,7 +38,25 @@ from cars.pipelines.parameters.sensor_inputs import CARS_GEOID_PATH
 from cars.pipelines.pipeline_constants import ADVANCED
 
 
-def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
+def get_epipolar_resolutions(conf):
+    """
+    Get the epipolar resolutions from the configuration
+
+    :param conf: configuration of advanced parameters
+    :type conf: dict
+
+    :return: list of epipolar resolutions
+    :rtype: list
+    """
+    if adv_cst.EPIPOLAR_RESOLUTIONS in conf:
+        return conf[adv_cst.EPIPOLAR_RESOLUTIONS]
+
+    return [16, 4, 1]
+
+
+def check_advanced_parameters(
+    inputs, conf, check_epipolar_a_priori=True, output_dem_dir=None
+):
     """
     Check the advanced parameters consistency
 
@@ -65,7 +82,8 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
     )
 
     overloaded_conf[adv_cst.KEEP_LOW_RES_DIR] = conf.get(
-        adv_cst.KEEP_LOW_RES_DIR, True
+        adv_cst.KEEP_LOW_RES_DIR,
+        bool(overloaded_conf[adv_cst.SAVE_INTERMEDIATE_DATA]),
     )
 
     overloaded_conf[adv_cst.DEBUG_WITH_ROI] = conf.get(
@@ -78,11 +96,16 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
 
     overloaded_conf[adv_cst.PHASING] = conf.get(adv_cst.PHASING, None)
 
-    overloaded_conf[adv_cst.EPIPOLAR_RESOLUTIONS] = conf.get(
-        adv_cst.EPIPOLAR_RESOLUTIONS, [16, 4, 1]
+    overloaded_conf[adv_cst.EPIPOLAR_RESOLUTIONS] = get_epipolar_resolutions(
+        conf
+    )
+
+    # use endogenous dm when generated
+    overloaded_conf[adv_cst.USE_ENDOGENOUS_DEM] = conf.get(
+        adv_cst.USE_ENDOGENOUS_DEM,
+        inputs[sens_cst.INITIAL_ELEVATION][sens_cst.DEM_PATH] is None,
     )
 
-    overloaded_conf[adv_cst.MERGING] = conf.get(adv_cst.MERGING, False)
     overloaded_conf[adv_cst.DSM_MERGING_TILE_SIZE] = conf.get(
         adv_cst.DSM_MERGING_TILE_SIZE, 4000
     )
@@ -124,35 +147,25 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
         check_ground_truth_dsm_data(overloaded_conf[adv_cst.GROUND_TRUTH_DSM])
 
     if check_epipolar_a_priori:
-        # Check conf use_epipolar_a_priori
-        overloaded_conf[adv_cst.USE_EPIPOLAR_A_PRIORI] = conf.get(
-            adv_cst.USE_EPIPOLAR_A_PRIORI, False
-        )
         # Retrieve epipolar_a_priori if it is provided
         overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI] = conf.get(
-            adv_cst.EPIPOLAR_A_PRIORI, {}
+            adv_cst.EPIPOLAR_A_PRIORI, None
         )
         # Retrieve terrain_a_priori if it is provided
         overloaded_conf[adv_cst.TERRAIN_A_PRIORI] = conf.get(
-            adv_cst.TERRAIN_A_PRIORI, {}
+            adv_cst.TERRAIN_A_PRIORI, None
         )
 
     # Check geometry plugin
     geom_plugin_without_dem_and_geoid = None
     geom_plugin_with_dem_and_geoid = None
-    dem_generation_roi = None
-
-    # If use a priori, override initial elevation with dem_median
-    if adv_cst.USE_EPIPOLAR_A_PRIORI in overloaded_conf:
-        if overloaded_conf[adv_cst.USE_EPIPOLAR_A_PRIORI]:
-            if adv_cst.DEM_MEDIAN in overloaded_conf[adv_cst.TERRAIN_A_PRIORI]:
-                inputs[sens_cst.INITIAL_ELEVATION][sens_cst.DEM_PATH] = (
-                    overloaded_conf[adv_cst.TERRAIN_A_PRIORI][
-                        adv_cst.DEM_MEDIAN
-                    ]
-                )
 
     scaling_coeff = None
+    # Get last resolution for scaling
+    if isinstance(overloaded_conf[adv_cst.EPIPOLAR_RESOLUTIONS], list):
+        epipolar_resolution = overloaded_conf[adv_cst.EPIPOLAR_RESOLUTIONS][-1]
+    else:
+        epipolar_resolution = overloaded_conf[adv_cst.EPIPOLAR_RESOLUTIONS]
     if inputs[sens_cst.SENSORS] is not None:
         # Check geometry plugin and overwrite geomodel in conf inputs
         (
@@ -160,12 +173,14 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
             overloaded_conf[adv_cst.GEOMETRY_PLUGIN],
             geom_plugin_without_dem_and_geoid,
             geom_plugin_with_dem_and_geoid,
-            dem_generation_roi,
             scaling_coeff,
         ) = sensor_inputs.check_geometry_plugin(
-            inputs, conf.get(adv_cst.GEOMETRY_PLUGIN, None)
+            inputs,
+            conf.get(adv_cst.GEOMETRY_PLUGIN, None),
+            epipolar_resolution,
+            output_dem_dir,
         )
-    elif depth_cst.DEPTH_MAPS in inputs or dsm_cst.DSMS in inputs:
+    elif dsm_cst.DSMS in inputs:
         # assume the input comes from 0.5m sensor images
         scaling_coeff = 1
         # If there's an initial elevation with
@@ -173,7 +188,7 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
         (
             overloaded_conf[adv_cst.GEOMETRY_PLUGIN],
             geom_plugin_with_dem_and_geoid,
-        ) = depth_map_inputs.check_geometry_plugin(
+        ) = dsm_inputs.check_geometry_plugin(
             inputs, conf.get(adv_cst.GEOMETRY_PLUGIN, None)
         )
 
@@ -183,7 +198,6 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
     # Validate inputs
     schema = {
         adv_cst.DEBUG_WITH_ROI: bool,
-        adv_cst.MERGING: bool,
         adv_cst.SAVE_INTERMEDIATE_DATA: Or(dict, bool),
         adv_cst.KEEP_LOW_RES_DIR: bool,
         adv_cst.GROUND_TRUTH_DSM: Or(dict, str),
@@ -196,11 +210,11 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
         adv_cst.EPIPOLAR_RESOLUTIONS: Or(int, list),
         adv_cst.LAND_COVER_MAP: str,
         adv_cst.CLASSIFICATION_TO_CONFIGURATION_MAPPING: str,
+        adv_cst.USE_ENDOGENOUS_DEM: bool,
     }
     if check_epipolar_a_priori:
-        schema[adv_cst.USE_EPIPOLAR_A_PRIORI] = bool
-        schema[adv_cst.EPIPOLAR_A_PRIORI] = dict
-        schema[adv_cst.TERRAIN_A_PRIORI] = dict
+        schema[adv_cst.EPIPOLAR_A_PRIORI] = Or(None, dict)
+        schema[adv_cst.TERRAIN_A_PRIORI] = Or(None, dict)
 
     checker_advanced_parameters = Checker(schema)
     checker_advanced_parameters.validate(overloaded_conf)
@@ -209,6 +223,7 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
     epipolar_schema = {
         adv_cst.GRID_CORRECTION: Or(list, None),
         adv_cst.DISPARITY_RANGE: list,
+        adv_cst.REFERENCE_DEM: Or(str, None),
     }
     checker_epipolar = Checker(epipolar_schema)
 
@@ -225,30 +240,18 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
         overloaded_conf[adv_cst.TERRAIN_A_PRIORI][adv_cst.DEM_MAX] = (
             overloaded_conf[adv_cst.TERRAIN_A_PRIORI].get(adv_cst.DEM_MAX, None)
         )
-        overloaded_conf[adv_cst.TERRAIN_A_PRIORI][
-            adv_cst.ALTITUDE_DELTA_MIN
-        ] = overloaded_conf[adv_cst.TERRAIN_A_PRIORI].get(
-            adv_cst.ALTITUDE_DELTA_MIN, None
-        )
-        overloaded_conf[adv_cst.TERRAIN_A_PRIORI][
-            adv_cst.ALTITUDE_DELTA_MAX
-        ] = overloaded_conf[adv_cst.TERRAIN_A_PRIORI].get(
-            adv_cst.ALTITUDE_DELTA_MAX, None
-        )
         terrain_a_priori_schema = {
             adv_cst.DEM_MEDIAN: str,
             adv_cst.DEM_MIN: Or(str, None),  # TODO mandatory with local disp
             adv_cst.DEM_MAX: Or(str, None),
-            adv_cst.ALTITUDE_DELTA_MIN: Or(int, None),
-            adv_cst.ALTITUDE_DELTA_MAX: Or(int, None),
         }
         checker_terrain = Checker(terrain_a_priori_schema)
         checker_terrain.validate(overloaded_conf[adv_cst.TERRAIN_A_PRIORI])
 
     # check epipolar a priori for each image pair
-    if (
-        check_epipolar_a_priori
-        and overloaded_conf[adv_cst.USE_EPIPOLAR_A_PRIORI]
+    if check_epipolar_a_priori and (
+        not overloaded_conf[adv_cst.TERRAIN_A_PRIORI] in (None, {})
+        or not overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI] in (None, {})
     ):
         validate_epipolar_a_priori(overloaded_conf, checker_epipolar)
 
@@ -258,7 +261,6 @@ def check_advanced_parameters(inputs, conf, check_epipolar_a_priori=True):
         overloaded_conf[adv_cst.GEOMETRY_PLUGIN],
         geom_plugin_without_dem_and_geoid,
         geom_plugin_with_dem_and_geoid,
-        dem_generation_roi,
         scaling_coeff,
         overloaded_conf[adv_cst.LAND_COVER_MAP],
         overloaded_conf[adv_cst.CLASSIFICATION_TO_CONFIGURATION_MAPPING],
@@ -356,10 +358,11 @@ def validate_epipolar_a_priori(
     :type checker_epipolar: Checker
     """
 
-    for key_image_pair in overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI]:
-        checker_epipolar.validate(
-            overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI][key_image_pair]
-        )
+    if overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI] is not None:
+        for key_image_pair in overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI]:
+            checker_epipolar.validate(
+                overloaded_conf[adv_cst.EPIPOLAR_A_PRIORI][key_image_pair]
+            )
 
 
 def check_ground_truth_dsm_data(conf):
@@ -440,22 +443,23 @@ def check_ground_truth_dsm_data(conf):
                     raise RuntimeError("interpolator does not exist")
 
 
-def update_conf(
+def update_conf(  # pylint: disable=too-many-positional-arguments  # noqa: C901
     conf,
     grid_correction_coef=None,
+    reference_dem=None,
     dmin=None,
     dmax=None,
     pair_key=None,
     dem_median=None,
     dem_min=None,
     dem_max=None,
-    altitude_delta_max=None,
-    altitude_delta_min=None,
 ):
     """
     Update the conf with grid correction and disparity range
     :param grid_correction_coef: grid correction coefficient
     :type grid_correction_coef: list
+    :param reference_dem: Dem used to compute epipolar grids
+    :type reference_dem: str
     :param dmin: disparity range minimum
     :type dmin: float
     :param dmax: disparity range maximum
@@ -465,9 +469,18 @@ def update_conf(
     """
 
     if pair_key is not None:
+        if ADVANCED not in conf:
+            conf[ADVANCED] = {}
+        if adv_cst.EPIPOLAR_A_PRIORI not in conf[ADVANCED]:
+            conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI] = {}
+        if conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI] is None:
+            conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI] = {}
         if pair_key not in conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI]:
             conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI][pair_key] = {}
-        if grid_correction_coef is not None:
+        if grid_correction_coef is not None and reference_dem is not None:
+            conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI][pair_key][
+                "reference_dem"
+            ] = reference_dem
             if len(grid_correction_coef) == 2:
                 conf[ADVANCED][adv_cst.EPIPOLAR_A_PRIORI][pair_key][
                     "grid_correction"
@@ -491,17 +504,14 @@ def update_conf(
                 dmax,
             ]
 
+    if adv_cst.TERRAIN_A_PRIORI not in conf[ADVANCED]:
+        conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI] = {}
+    if conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI] is None:
+        conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI] = {}
+
     if dem_median is not None:
         conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI]["dem_median"] = dem_median
     if dem_min is not None:
         conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI]["dem_min"] = dem_min
     if dem_max is not None:
         conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI]["dem_max"] = dem_max
-    if altitude_delta_max is not None:
-        conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI][
-            "altitude_delta_max"
-        ] = altitude_delta_max
-    if altitude_delta_min is not None:
-        conf[ADVANCED][adv_cst.TERRAIN_A_PRIORI][
-            "altitude_delta_min"
-        ] = altitude_delta_min

cars/pipelines/parameters/advanced_parameters_constants.py

@@ -32,28 +32,25 @@ CLASSIFICATION_TO_CONFIGURATION_MAPPING = (
     "classification_to_configuration_mapping"
 )
 
-USE_EPIPOLAR_A_PRIORI = "use_epipolar_a_priori"
 EPIPOLAR_A_PRIORI = "epipolar_a_priori"
 RESOLUTION_A_PRIORI = "resolution_a_priori"
 GROUND_TRUTH_DSM = "ground_truth_dsm"
 
 EPIPOLAR_RESOLUTIONS = "epipolar_resolutions"
 
-MERGING = "merging"
 DSM_MERGING_TILE_SIZE = "dsm_merging_tile_size"
 
 
 # inner epipolar a priori constants
 GRID_CORRECTION = "grid_correction"
 DISPARITY_RANGE = "disparity_range"
+REFERENCE_DEM = "reference_dem"
 
 TERRAIN_A_PRIORI = "terrain_a_priori"
-
+USE_ENDOGENOUS_DEM = "use_endogenous_dem"
 DEM_MEDIAN = "dem_median"
 DEM_MIN = "dem_min"
 DEM_MAX = "dem_max"
-ALTITUDE_DELTA_MAX = "altitude_delta_max"
-ALTITUDE_DELTA_MIN = "altitude_delta_min"
 
 # ground truth dsm
 INPUT_GROUND_TRUTH_DSM = "dsm"

cars/pipelines/parameters/application_parameters.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# coding: utf8
+#
+# Copyright (c) 2020 Centre National d'Etudes Spatiales (CNES).
+#
+# This file is part of CARS
+# (see https://github.com/CNES/cars).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+General application configuration module
+"""
+
+
+def get_needed_apps(
+    sensors_in_inputs, save_output_dsm, save_output_point_cloud, conf
+):
+    """
+    This function returns the apps needed by the CARS pipeline,
+    depending on overall parameters and the user configuration
+    """
+    needed_applications = []
+    if sensors_in_inputs:
+        needed_applications += [
+            "grid_generation",
+            "resampling",
+            "ground_truth_reprojection",
+            "dense_match_filling",
+            "sparse_matching",
+            "dense_matching",
+            "triangulation",
+            "dem_generation",
+        ]
+
+        add_default_pc_outlier_removal = True
+        for key in conf:
+            if key.startswith("point_cloud_outlier_removal"):
+                add_default_pc_outlier_removal = False
+                needed_applications += [key]
+
+        if add_default_pc_outlier_removal:
+            needed_applications += [
+                "point_cloud_outlier_removal.1",
+                "point_cloud_outlier_removal.2",
+            ]
+
+    if save_output_dsm or save_output_point_cloud:
+        needed_applications += ["pc_denoising"]
+
+        if save_output_dsm:
+            needed_applications += [
+                "point_cloud_rasterization",
+                "auxiliary_filling",
+            ]
+
+            for key in conf:
+                if key.startswith("dsm_filling"):
+                    needed_applications += [key]
+
+    return needed_applications