fix: parameter mntShadowExtent was not passed correctly in Idepix OLCI and MERIS

Author: dolaf

idepix-meris/src/main/java/org/esa/snap/idepix/meris/IdepixMerisMountainShadowOp.java

@@ -103,20 +103,8 @@ protected void computePixel(int x, int y, Sample[] sourceSamples, WritableSample
             final GeoPos geoPos = l1bProduct.getSceneGeoCoding().getGeoPos(pixelPos, null);
             final double saaApparent = IdepixMerisUtils.computeApparentSaa(sza, saa, oza, oaa, geoPos.getLat());
 
-            if (x == 2783 && y == 642) {
-                System.out.println("x, y = " + x + ", " + y);  // small subset, shadow
-            }
-            if (x == 2783 && y == 2181) {
-                System.out.println("x, y = " + x + ", " + y);  // large subset, no shadow
-            }
-            final boolean isMountainShadow =
-                    isMountainShadow(sza, (float) saaApparent, slope, aspect, orientation, mntShadowExtent);
-
-            if (isMountainShadow) {
-                System.out.println("x, y, slope, aspect, orientation = " +
-                        x + ", " + y + ", " + slope + ", " + aspect + ", " + orientation);
-            }
-            targetSamples[MOUNTAIN_SHADOW_FLAG_BAND_INDEX].set(isMountainShadow);
+            targetSamples[MOUNTAIN_SHADOW_FLAG_BAND_INDEX].set(isMountainShadow(sza, (float) saaApparent,
+                    slope, aspect, orientation, mntShadowExtent));
         }
     }
 

idepix-meris/src/main/java/org/esa/snap/idepix/meris/IdepixMerisOp.java

@@ -256,6 +256,7 @@ private void postProcess() {
         Map<String, Object> params = new HashMap<>();
         params.put("computeCloudShadow", computeCloudShadow);
         params.put("computeMountainShadow", computeMountainShadow);
+        params.put("mntShadowExtent", mntShadowExtent);
         params.put("refineClassificationNearCoastlines", true);  // always an improvement
 
         final Product classifiedProduct = GPF.createProduct(OperatorSpi.getOperatorAlias(IdepixMerisPostProcessOp.class),

idepix-meris/src/main/java/org/esa/snap/idepix/meris/IdepixMerisPostProcessOp.java

@@ -112,7 +112,7 @@ public void initialize() throws OperatorException {
         if (computeMountainShadow) {
             ensureBandsAreCopied(l1bProduct, merisCloudProduct, latTpg.getName(), lonTpg.getName(), altTpg.getName());
             Map<String, Object> mntShadowParams = new HashMap<>();
-            mntShadowParams.put("mntShadowStrength", mntShadowExtent);
+            mntShadowParams.put("mntShadowExtent", mntShadowExtent);
 
             HashMap<String, Product> input = new HashMap<>();
             input.put("l1b", l1bProduct);

idepix-olci/src/main/java/org/esa/snap/idepix/olci/IdepixOlciOp.java

@@ -279,7 +279,7 @@ private void postProcess(Product olciIdepixProduct) {
         params.put("cloudBufferWidth", cloudBufferWidth);
         params.put("computeCloudShadow", computeCloudShadow);
         params.put("computeMountainShadow", computeMountainShadow);
-        params.put("mntShadowStrength", mntShadowExtent);
+        params.put("mntShadowExtent", mntShadowExtent);
 
         postProcessingProduct = GPF.createProduct(OperatorSpi.getOperatorAlias(IdepixOlciPostProcessOp.class),
                                                   params, input);

idepix-olci/src/main/java/org/esa/snap/idepix/olci/IdepixOlciPostProcessOp.java

@@ -114,7 +114,7 @@ public void initialize() throws OperatorException {
         if (computeMountainShadow) {
             ensureBandsAreCopied(l1bProduct, olciCloudProduct, latBand.getName(), lonBand.getName(), altBand.getName());
             Map<String, Object> mntShadowParams = new HashMap<>();
-            mntShadowParams.put("mntShadowStrength", mntShadowExtent);
+            mntShadowParams.put("mntShadowExtent", mntShadowExtent);
 
             HashMap<String, Product> input = new HashMap<>();
             input.put("l1b", l1bProduct);