Commit c1887cd5 authored by Julie Brossard's avatar Julie Brossard
Browse files

Merge branch 'release_v4.2.3' into develop

parents 476ad9d4 50fcf3fc
......@@ -34,12 +34,12 @@
############################################################################################################
# The MAJA core version
set(MAJA_CORE_VERSION "4.2.2")
set(MAJA_CORE_VERSION "4.2.3")
# The MAJA algorithms version (3 digits)
set(MAJA_ALGORITHMS_VERSION "4.2.2")
set(MAJA_ALGORITHMS_VERSION "4.2.3")
set(MAJA_VERSION "4.2.2")
set(MAJA_VERSION "4.2.3")
set(MAJA_VERSION_CHAIN "4.2")
# List of the spectral camera available
......
......@@ -11,7 +11,7 @@
MAJA
Auteur : Equipe CS System d'Information
Date : 29/09/2020
Date : 17/12/2020
Ce fichier contient la description complete de la configuration de l'article decrit ci-apres.
......@@ -31,12 +31,12 @@ Rappel de la fonction : MAJA constitue la chaîne de niveaux 2 multi-missi
IDENTIFICATION DE LA VERSION
----------------------------
Date version : 04/11/2020
Numero version : 4.2.2
Date version : 07/12/2020
Numero version : 4.2.3
Numero version Superbuild-Archive : 4.2.0
Numero version reference : 4.2.0
Etat version : Teste, opérationnel.
Justification : Livraison MAJA V4.2.2
Justification : Livraison MAJA V4.2.3
Type de livraison : Complete
......@@ -185,8 +185,8 @@ Liste des FA corrigees
FA tracees dans le code source
------------------------------
185 :: Maja 4.2.1 No quicklook written for non-valid L2 | #CS
182 :: --version is no longer available | #CS
195 :: Error QKL xsd validation | #CS
193 :: "AttributeError: 'NoneType' object has no attribute 'keys'" | #CS
FA non tracees dans le code source
......
......@@ -260,7 +260,7 @@ class CAMSFileHandler(object):
cams_app_param["after.mrfile"] = self._afterFile["mr_file"]
cams_app_param["after.rhfile"] = self._afterFile["rh_file"]
cams_app_param["after.modellevels"] = self._afterFile["model_levels"]
if "NbNonInterpolate" in self._beforeFile.keys():
if "NbNonInterpolate" in self._afterFile.keys():
cams_app_param["after.nbnointerpol"] = self._afterFile["NbNonInterpolate"]
self.__camsapp = OtbAppHandler("CAMSComputation", cams_app_param, write_output=True)
......
......@@ -725,10 +725,11 @@ class MajaMuscateL2HeaderWriter(L2HeaderWriterBase):
xml_tools.remove_node(output_handler.root, "//Product_Organisation/Muscate_Product/Image_List/" +
"Image_MACC_template_temporary_node_Flat_Reflectance")
if not self.writel2products:
# DM2706
xml_tools.remove_child(output_handler.root, "//Product_Organisation/Muscate_Product/Image_List")
xml_tools.remove_child(output_handler.root, "//Product_Organisation/Muscate_Product/Mask_List")
xml_tools.remove_node(output_handler.root, "//Product_Organisation/Muscate_Product/Image_List")
xml_tools.remove_node(output_handler.root, "//Product_Organisation/Muscate_Product/Mask_List")
# Write Private_Directory
output_handler.set_value_of("JobProcessingInformationsFileFilename", "DATA/" + os.path.basename(pJpiFilename))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment