Idepix OLCI/SLSTR: (preliminary) finished after tests including cloud shadow and using OLCI O2a Harmonisation supporting SYN

Author: dolaf

idepix-olcislstr/src/main/java/org/esa/snap/idepix/olcislstr/OlciSlstrClassificationOp.java

@@ -58,7 +58,6 @@ public class OlciSlstrClassificationOp extends Operator {
 
     private Band landWaterBand;
 
-//    public static final String OLCISLSTR_ALL_NET_NAME = "11x9x6x4x3x2_57.8.net";
     public static final String OLCISLSTR_ALL_NET_NAME = "11x10x4x3x2_207.9.net";
 
     private static final double THRESH_LAND_MINBRIGHT1 = 0.3;
@@ -110,7 +109,7 @@ void createTargetProduct() throws OperatorException {
         ProductUtils.copyGeoCoding(sourceProduct, targetProduct);
         targetProduct.setStartTime(sourceProduct.getStartTime());
         targetProduct.setEndTime(sourceProduct.getEndTime());
-        ProductUtils.copyMetadata(sourceProduct, targetProduct);
+//        ProductUtils.copyMetadata(sourceProduct, targetProduct);
 
         if (outputSchillerNNValue) {
             final Band nnValueBand = targetProduct.addBand(IdepixConstants.NN_OUTPUT_BAND_NAME, ProductData.TYPE_FLOAT32);

idepix-olcislstr/src/main/java/org/esa/snap/idepix/olcislstr/OlciSlstrCtpOp.java

@@ -4,8 +4,7 @@
 import org.esa.snap.core.datamodel.Band;
 import org.esa.snap.core.datamodel.Product;
 import org.esa.snap.core.datamodel.ProductData;
-import org.esa.snap.core.datamodel.TiePointGrid;
-import org.esa.snap.core.gpf.GPF;
+import org.esa.snap.core.datamodel.RasterDataNode;
 import org.esa.snap.core.gpf.OperatorException;
 import org.esa.snap.core.gpf.OperatorSpi;
 import org.esa.snap.core.gpf.Tile;
@@ -23,8 +22,6 @@
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  *
@@ -48,7 +45,6 @@ public class OlciSlstrCtpOp extends BasisOp {
 
     @SourceProduct(alias = "o2CorrProduct",
             label = "OLCI O2 Correction product",
-            optional = true,
             description = "OLCI O2 Correction product.")
     private Product o2CorrProduct;
 
@@ -64,10 +60,10 @@ public class OlciSlstrCtpOp extends BasisOp {
 
     static final String DEFAULT_TENSORFLOW_NN_DIR_NAME = "nn_training_20190131_I7x30x30x30x10x2xO1";
 
-    private TiePointGrid szaBand;
-    private TiePointGrid ozaBand;
-    private TiePointGrid saaBand;
-    private TiePointGrid oaaBand;
+    private RasterDataNode szaBand;
+    private RasterDataNode ozaBand;
+    private RasterDataNode saaBand;
+    private RasterDataNode oaaBand;
 
     private Band rad12Band;
     private Band solarFlux12Band;
@@ -116,12 +112,11 @@ public void dispose() {
     public void doExecute(ProgressMonitor pm) throws OperatorException {
         try {
             pm.beginTask("Executing CTP processing...", 0);
-            preProcess();
 
-            szaBand = sourceProduct.getTiePointGrid("SZA");
-            ozaBand = sourceProduct.getTiePointGrid("OZA");
-            saaBand = sourceProduct.getTiePointGrid("SAA");
-            oaaBand = sourceProduct.getTiePointGrid("OAA");
+            szaBand = sourceProduct.getRasterDataNode("SZA");
+            ozaBand = sourceProduct.getRasterDataNode("OZA");
+            saaBand = sourceProduct.getRasterDataNode("SAA");
+            oaaBand = sourceProduct.getRasterDataNode("OAA");
 
             rad12Band = sourceProduct.getBand("Oa12_radiance");
             solarFlux12Band = sourceProduct.getBand("solar_flux_band_12");
@@ -197,25 +192,12 @@ public void computeTile(Band targetBand, Tile targetTile, ProgressMonitor pm) th
 
     }
 
-    private void preProcess() {
-        if (o2CorrProduct == null) {
-            Map<String, Product> o2corrSourceProducts = new HashMap<>();
-            Map<String, Object> o2corrParms = new HashMap<>();
-            o2corrParms.put("processOnlyBand13", false);
-            o2corrParms.put("writeHarmonisedRadiances", false);
-            o2corrSourceProducts.put("l1bProduct", sourceProduct);
-            final String o2CorrOpName = "OlciO2aHarmonisation";
-            o2CorrProduct = GPF.createProduct(o2CorrOpName, o2corrParms, o2corrSourceProducts);
-        }
-    }
-
     private Product createTargetProduct() {
         Product targetProduct = new Product(sourceProduct.getName(),
                                             sourceProduct.getProductType(),
                                             sourceProduct.getSceneRasterWidth(),
                                             sourceProduct.getSceneRasterHeight());
 
-        ProductUtils.copyMetadata(sourceProduct, targetProduct);
         ProductUtils.copyGeoCoding(sourceProduct, targetProduct);
         ProductUtils.copyFlagCodings(sourceProduct, targetProduct);
         ProductUtils.copyFlagBands(sourceProduct, targetProduct, true);

idepix-olcislstr/src/main/java/org/esa/snap/idepix/olcislstr/OlciSlstrOp.java

@@ -90,6 +90,7 @@ public class OlciSlstrOp extends BasisOp {
 
     private Product olciRad2reflProduct;
     private Product ctpProduct;
+    private Product o2CorrProduct;
     private Product waterMaskProduct;
 
     private Map<String, Product> classificationInputProducts;
@@ -136,7 +137,7 @@ private Product createTargetProduct(Product idepixProduct) {
                                             idepixProduct.getSceneRasterWidth(),
                                             idepixProduct.getSceneRasterHeight());
 
-        ProductUtils.copyMetadata(idepixProduct, targetProduct);
+//        ProductUtils.copyMetadata(idepixProduct, targetProduct);
         ProductUtils.copyGeoCoding(idepixProduct, targetProduct);
         ProductUtils.copyFlagCodings(idepixProduct, targetProduct);
         ProductUtils.copyFlagBands(idepixProduct, targetProduct, true);
@@ -172,7 +173,15 @@ private void preProcess() {
         waterMaskProduct = GPF.createProduct("LandWaterMask", waterMaskParameters, sourceProduct);
 
         if (computeCloudShadow) {
-            ctpProduct = OlciSlstrUtils.computeCloudTopPressureProduct(sourceProduct);
+            Map<String, Product> o2corrSourceProducts = new HashMap<>();
+            o2corrSourceProducts.put("l1bProduct", sourceProduct);
+            final String o2CorrOpName = "OlciO2aHarmonisation";
+            Map<String, Object> o2corrParms = new HashMap<>();
+            o2corrParms.put("writeHarmonisedRadiances", false);
+            o2corrParms.put("processOnlyBand13", false);
+            o2CorrProduct = GPF.createProduct(o2CorrOpName, o2corrParms, o2corrSourceProducts);
+
+            ctpProduct = OlciSlstrUtils.computeCloudTopPressureProduct(sourceProduct, o2CorrProduct);
         }
     }
 

idepix-olcislstr/src/main/java/org/esa/snap/idepix/olcislstr/OlciSlstrPostProcessOp.java

@@ -1,10 +1,7 @@
 package org.esa.snap.idepix.olcislstr;
 
 import com.bc.ceres.core.ProgressMonitor;
-import org.esa.snap.core.datamodel.Band;
-import org.esa.snap.core.datamodel.GeoCoding;
-import org.esa.snap.core.datamodel.Product;
-import org.esa.snap.core.datamodel.TiePointGrid;
+import org.esa.snap.core.datamodel.*;
 import org.esa.snap.core.gpf.Operator;
 import org.esa.snap.core.gpf.OperatorException;
 import org.esa.snap.core.gpf.OperatorSpi;
@@ -59,12 +56,12 @@ public class OlciSlstrPostProcessOp extends Operator {
     private Band origCloudFlagBand;
 
     private Band ctpBand;
-    private TiePointGrid szaTPG;
-    private TiePointGrid saaTPG;
-    private TiePointGrid ozaTPG;
-    private TiePointGrid oaaTPG;
-    private TiePointGrid slpTPG;
-    private TiePointGrid[] temperatureProfileTPGs;
+    private RasterDataNode szaTPG;
+    private RasterDataNode saaTPG;
+    private RasterDataNode ozaTPG;
+    private RasterDataNode oaaTPG;
+    private RasterDataNode slpTPG;
+    private RasterDataNode[] temperatureProfileTPGs;
     private Band altBand;
 
     private GeoCoding geoCoding;
@@ -82,18 +79,18 @@ public void initialize() throws OperatorException {
 
         origCloudFlagBand = olciSlstrCloudProduct.getBand(IdepixConstants.CLASSIF_BAND_NAME);
 
-        szaTPG = l1bProduct.getTiePointGrid("SZA");
-        saaTPG = l1bProduct.getTiePointGrid("SAA");
-        ozaTPG = l1bProduct.getTiePointGrid("OZA");
-        oaaTPG = l1bProduct.getTiePointGrid("OAA");
-        slpTPG = l1bProduct.getTiePointGrid("sea_level_pressure");
+        szaTPG = l1bProduct.getRasterDataNode("SZA");
+        saaTPG = l1bProduct.getRasterDataNode("SAA");
+        ozaTPG = l1bProduct.getRasterDataNode("OZA");
+        oaaTPG = l1bProduct.getRasterDataNode("OAA");
+        slpTPG = l1bProduct.getRasterDataNode("sea_level_pressure");
 
         altBand = l1bProduct.getBand(OlciSlstrConstants.OLCI_ALTITUDE_BAND_NAME);
 
-        temperatureProfileTPGs = new TiePointGrid[OlciSlstrConstants.referencePressureLevels.length];
+        temperatureProfileTPGs = new RasterDataNode[OlciSlstrConstants.referencePressureLevels.length];
         for (int i = 0; i < OlciSlstrConstants.referencePressureLevels.length; i++) {
             temperatureProfileTPGs[i] =
-                    l1bProduct.getTiePointGrid("atmospheric_temperature_profile_pressure_level_" + (i + 1));
+                    l1bProduct.getRasterDataNode("atmospheric_temperature_profile_pressure_level_" + (i + 1));
         }
 
 

idepix-olcislstr/src/main/java/org/esa/snap/idepix/olcislstr/OlciSlstrUtils.java

@@ -185,9 +185,10 @@ private static double getHeightFromCtp(double ctp, double p0, double ts) {
     }
 
     // todo: RENOVATION: code duplication from OLCI module, move to core
-    static Product computeCloudTopPressureProduct(Product sourceProduct) {
+    static Product computeCloudTopPressureProduct(Product sourceProduct, Product o2CorrProduct) {
         Map<String, Product> ctpSourceProducts = new HashMap<>();
         ctpSourceProducts.put("sourceProduct", sourceProduct);
+        ctpSourceProducts.put("o2CorrProduct", o2CorrProduct);
         Map<String, Object> params = new HashMap<>(2);
         params.put("outputCtp", false);
         return GPF.createProduct(OperatorSpi.getOperatorAlias(OlciSlstrCtpOp.class), params, ctpSourceProducts);