cars 1.0.0a2__cp312-cp312-win_amd64.whl → 1.0.0a4__cp312-cp312-win_amd64.whl

cars/pipelines/parameters/sensor_loaders/{pivot_sensor_loader.py → pivot_image_loader.py}

@@ -19,7 +19,7 @@
 # limitations under the License.
 #
 """
-this module contains the PivotSensorLoader class.
+this module contains the PivotImageSensorLoader class.
 """
 
 from json_checker import Checker, Or
@@ -33,10 +33,10 @@ from cars.pipelines.parameters.sensor_loaders.sensor_loader_template import (
 )
 
 
-@SensorLoader.register("pivot")
-class PivotSensorLoader(SensorLoaderTemplate):
+@SensorLoader.register("pivot_image")
+class PivotImageSensorLoader(SensorLoaderTemplate):
     """
-    Pivot sensor loader : used by CARS to read inputs
+    Pivot image sensor loader : used by CARS to read inputs
     """
 
     def check_conf(self, conf):
@@ -59,7 +59,7 @@ class PivotSensorLoader(SensorLoaderTemplate):
         # Check consistency between files
         b0_path = overloaded_conf["bands"]["b0"]["path"]
         b0_size = inputs.rasterio_get_size(b0_path)
-        b0_transform = inputs.rasterio_get_size(b0_path)
+        b0_transform = inputs.rasterio_get_transform(b0_path)
         for band in overloaded_conf["bands"]:
             band_path = overloaded_conf["bands"][band]["path"]
             band_id = overloaded_conf["bands"][band]["band"]
@@ -71,7 +71,7 @@ class PivotSensorLoader(SensorLoaderTemplate):
                 )
             if band_path != b0_path:
                 band_size = inputs.rasterio_get_size(band_path)
-                band_transform = inputs.rasterio_get_size(band_path)
+                band_transform = inputs.rasterio_get_transform(band_path)
                 if b0_size != band_size:
                     raise RuntimeError(
                         "The files {} and {} do not have the same size"
@@ -85,15 +85,7 @@ class PivotSensorLoader(SensorLoaderTemplate):
                             band_transform,
                         )
                     )
-        overloaded_conf["main_file"] = conf.get("main_file", None)
-        if overloaded_conf["main_file"] is None:
-            overloaded_conf["main_file"] = overloaded_conf["bands"]["b0"][
-                "path"
-            ]
-        else:
-            overloaded_conf["main_file"] = make_relative_path_absolute(
-                overloaded_conf["main_file"], self.config_dir
-            )
+        overloaded_conf["main_file"] = overloaded_conf["bands"]["b0"]["path"]
         overloaded_conf["texture_bands"] = conf.get("texture_bands", None)
         if overloaded_conf["texture_bands"] is not None:
             for texture_band in overloaded_conf["texture_bands"]:
@@ -105,12 +97,9 @@ class PivotSensorLoader(SensorLoaderTemplate):
                         )
                     )
 
-        if self.input_type == "image":
-            overloaded_conf[sens_cst.INPUT_NODATA] = conf.get(
-                sens_cst.INPUT_NODATA, 0
-            )
-        else:
-            overloaded_conf[sens_cst.INPUT_NODATA] = None
+        overloaded_conf[sens_cst.INPUT_NODATA] = conf.get(
+            sens_cst.INPUT_NODATA, 0
+        )
 
         sensor_schema = {
             "loader": str,

cars/pipelines/parameters/sensor_loaders/sensor_loader.py

@@ -38,9 +38,7 @@ class SensorLoader:
     # sensor loaders
     available_loaders = {}
 
-    def __new__(
-        cls, app_name: str, cfg: dict, input_type: str, config_dir: str
-    ):
+    def __new__(cls, app_name: str, cfg: dict, config_dir: str):
         """
         Return the instance of sensor loader associated with the sensor loader
         name given as parameter
@@ -51,10 +49,10 @@ class SensorLoader:
         :type cfg: dictionary
         """
 
-        return cls.create_app(app_name, cfg, input_type, config_dir)
+        return cls.create_app(app_name, cfg, config_dir)
 
     @classmethod
-    def create_app(cls, name: str, cfg: dict, input_type: str, config_dir: str):
+    def create_app(cls, name: str, cfg: dict, config_dir: str):
         """
         Factory command to create the sensor loader
         Return the instance of sensor loader associated with the sensor loader
@@ -72,7 +70,7 @@ class SensorLoader:
         except KeyError:
             logging.error("No sensor loader named {0} supported".format(name))
             return None
-        loader = loader_class(cfg, input_type, config_dir)
+        loader = loader_class(cfg, config_dir)
         return loader
 
     @classmethod

cars/pipelines/parameters/sensor_loaders/sensor_loader_template.py

@@ -30,14 +30,12 @@ class SensorLoaderTemplate:
     Class for general specification of a sensor loader
     """
 
-    def __init__(self, conf, input_type, config_dir):
+    def __init__(self, conf, config_dir):
         """
         Init function of SensorLoaderTemplate
 
         :param conf: configuration for sensor loader
-        :param input_type: type of input : image or classification
         """
-        self.input_type = input_type
         self.config_dir = config_dir
         self.used_config = self.check_conf(conf)
 

cars/pipelines/pipeline_template.py

@@ -91,14 +91,12 @@ class PipelineTemplate(metaclass=ABCMeta):  # pylint: disable=R0903
         """
 
     @abstractmethod
-    def check_output(self, conf, pipeline):
+    def check_output(self, conf):
         """
         Check the output given
 
         :param conf: configuration of output
         :type conf: dict
-        :param pipeline: name of corresponding pipeline
-        :type pipeline_name: str
 
         :return overloader output
         :rtype : dict