diff --git a/orchestrator/cots/otb/algorithms/otb_binary_threshold.py b/orchestrator/cots/otb/algorithms/otb_binary_threshold.py index f4b6bda4ad3a85210aeb77679f27a612cf328d75..fe4ef5af18800e19897ab9413faf87e392384dd4 100644 --- a/orchestrator/cots/otb/algorithms/otb_binary_threshold.py +++ b/orchestrator/cots/otb/algorithms/otb_binary_threshold.py @@ -57,11 +57,11 @@ def binary_threshold(input_image, inside_value, outside_value, raise MajaProcessingError("Error, no threshold given") if lower_threshold is None: - expression = "im1b1<{up}?{in_v}:{out_v}".format(up=upper_threshold, in_v=inside_value, out_v=outside_value) + expression = "im1b1<={up}?{in_v}:{out_v}".format(up=upper_threshold, in_v=inside_value, out_v=outside_value) elif upper_threshold is None: - expression = "(im1b1>{low})?{in_v}:{out_v}".format(low=lower_threshold, in_v=inside_value, out_v=outside_value) + expression = "(im1b1>={low})?{in_v}:{out_v}".format(low=lower_threshold, in_v=inside_value, out_v=outside_value) else: - expression = "(im1b1>{low}&&im1b1<{up})?{in_v}:{out_v}".format(low=lower_threshold, up=upper_threshold, + expression = "(im1b1>={low}&&im1b1<={up})?{in_v}:{out_v}".format(low=lower_threshold, up=upper_threshold, in_v=inside_value, out_v=outside_value) out = band_math([input_image], expression, output_image=output_image, write_output=write_output) diff --git a/orchestrator/plugins/sentinel2_muscate/maja_sentinel2_muscate_l1_image_file_reader.py b/orchestrator/plugins/sentinel2_muscate/maja_sentinel2_muscate_l1_image_file_reader.py index 74d4e378ff8267a5d945bfe1595d6529a0a0f261..b1a12096ab84b1ebdf02b0e67b5ac5a1b94ed664 100644 --- a/orchestrator/plugins/sentinel2_muscate/maja_sentinel2_muscate_l1_image_file_reader.py +++ b/orchestrator/plugins/sentinel2_muscate/maja_sentinel2_muscate_l1_image_file_reader.py @@ -226,7 +226,7 @@ class Sentinel2MuscateL1ImageFileReader(Sentinel2L1ImageFileReaderBase): self._l2satmasklist[l_ListOfL2Resolution.index(curL1Res)] = sat_mask_app.getoutput().get("out") tmp_sat_resample = os.path.join(working, "tmp_extract_roi_sat_resample_{}.tif".format(curL1Res)) sat_resamp_app = resample(sat_mask_app.getoutput().get("out"), dtm_coarse, tmp_sat_resample, - OtbResampleType.LINEAR, write_output=False) + OtbResampleType.LINEAR_WITH_RADIUS, write_output=False) self._sub_sat_pipeline.add_otb_app(sat_resamp_app) for l1band in listOfL1Bands: l1BandIdx = l_BandsDefinitions.get_band_id_in_l1(l1band) @@ -256,7 +256,7 @@ class Sentinel2MuscateL1ImageFileReader(Sentinel2L1ImageFileReaderBase): ndt_mask_app.getoutput().get("out"), dtm_coarse, tmp_ndt_resample, - OtbResampleType.LINEAR, + OtbResampleType.LINEAR_WITH_RADIUS, write_output=False) self._subedg_pipeline.add_otb_app(ndt_resamp_app) for l1band in listOfL1Bands: @@ -264,7 +264,7 @@ class Sentinel2MuscateL1ImageFileReader(Sentinel2L1ImageFileReaderBase): tmp_ndt_roi = os.path.join(working, "tmp_extract_roi_ndt_{}.tif".format(l1band)) tmp_ndt_roi_app = extract_roi(ndt_resamp_app.getoutput().get("out"), [self.m_headerHandler.get_l1_ndt_image_index(l1BandIdx) - 1], - tmp_ndt_roi, write_output=False) + tmp_ndt_roi + ":uint8", write_output=False) self._subedg_pipeline.add_otb_app(tmp_ndt_roi_app) self._nodatamasksublist[l1BandIdx] = tmp_ndt_roi_app.getoutput().get("out") else: