Fix negReflectance for satellite convolutions, and S3B convolution

Author: oceancolorcoder

Config/sample_SEABIRD_pySAS.cfg

@@ -157,13 +157,13 @@
     "bL2EnablePercentLt": 1,
     "fL2PercentLt": 10.0,
     "fL2RhoSky": 0.0256,
-    "bL23CRho": 1,
-    "bL2Z17Rho": 0,
+    "bL23CRho": 0,
+    "bL2Z17Rho": 1,
     "bL2M99Rho": 0,
     "bL2RhoUnc10": 0,
     "bL2PerformNIRCorrection": 1,
-    "bL2SimpleNIRCorrection": 1,
-    "bL2SimSpecNIRCorrection": 0,
+    "bL2SimpleNIRCorrection": 0,
+    "bL2SimSpecNIRCorrection": 1,
     "bL2NegativeSpec": 1,
     "bL2BRDF": 0,
     "bL2BRDF_fQ": 0,

Config/sample_SEABIRD_pySAS.hdr

@@ -31,10 +31,10 @@
     "east_longitude": "",
     "west_longitude": "",
     "nadir": "40",
-    "rho_correction": "3C",
-    "NIR_residual_correction": "MA95",
+    "rho_correction": "Z17",
+    "NIR_residual_correction": "R06",
     "BRDF_correction": "noBRDF",
-    "comments": "! HyperInSPACE vers = 1.2.15\n! HyperInSPACE Config = sample_SEABIRD_pySAS.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = On\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = On\n! Rotator Min = -126.0\n! Rotator Max = 42.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 87.0\n! Rel Azimuth Max = 138.0\n! Deglitch Filter = On\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.5\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.0\n! LI Light Sigma = 2.9\n! LT Dark Window = 11\n! LT Light Window = 5\n! LT Dark Sigma = 3.5\n! LT Light Sigma = 2.9\n! FRM Pathway = FRM-Full-Characterization\n! Thermal Source = Internal_Thermistor\n! Default Salt = 38.0\n! Default SST = 28.0\n! Default AOD = 0.2\n! Default Wind = 5.0\n! Default AirTemp = 26.0\n! Wavelength Interp Int = 3.3\n! Max Wind = 10.0\n! Min SZA = 20.0\n! Max SZA = 60.0\n! Spectral Filter = On\n! Filter Sigma Es = 5.0\n! Filter Sigma Li = 8.0\n! Filter Sigma Lt = 3.0\n! Meteorological Filter = On\n! Cloud Flag = 1.0\n! Es Flag = 2.0\n! Dawn/Dusk Flag = 1.0\n! Rain/Humidity Flag = 1.095\n! Ensemble Interval = 300\n! Percent Lt Filter = On\n! Percent Light = 10.0\n! Remove Negatives = On",
+    "comments": "! HyperInSPACE vers = 1.2.16\n! HyperInSPACE Config = sample_SEABIRD_pySAS.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = On\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = On\n! Rotator Min = -126.0\n! Rotator Max = 42.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 87.0\n! Rel Azimuth Max = 138.0\n! Deglitch Filter = On\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.5\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.0\n! LI Light Sigma = 2.9\n! LT Dark Window = 11\n! LT Light Window = 5\n! LT Dark Sigma = 3.5\n! LT Light Sigma = 2.9\n! FRM Pathway = FRM-Full-Characterization\n! Thermal Source = Internal_Thermistor\n! Default Salt = 38.0\n! Default SST = 28.0\n! Default AOD = 0.2\n! Default Wind = 5.0\n! Default AirTemp = 26.0\n! Wavelength Interp Int = 3.3\n! Max Wind = 10.0\n! Min SZA = 20.0\n! Max SZA = 60.0\n! Spectral Filter = On\n! Filter Sigma Es = 5.0\n! Filter Sigma Li = 8.0\n! Filter Sigma Lt = 3.0\n! Meteorological Filter = On\n! Cloud Flag = 1.0\n! Es Flag = 2.0\n! Dawn/Dusk Flag = 1.0\n! Rain/Humidity Flag = 1.095\n! Ensemble Interval = 300\n! Percent Lt Filter = On\n! Percent Light = 10.0\n! Remove Negatives = On",
     "other_comments": "!\n! COMMENTS\n!\n! FRM4SOC-2 Field InterComparison Experiment (FICE)\n! July 11 - 21, 2022\n! Acqua Alta Oceanographic Tower (AAOT), CNR-ISMAR\n!\n! Ancillary data from: % https://www.comune.venezia.it/content/3-piattaforma-ISMAR-CNR\n! and field notes. relAz refers to target relative azimuth in pySAS.\n!\n! Home",
     "missing": -9999,
     "delimiter": "comma"

Source/ProcessL2.py

@@ -451,7 +451,7 @@ def spectralReflectance(node, sensor, timeObj, xSlice, F0, F0_unc, rhoScalar, rh
         liUNC = {}
         ltUNC = {}
 
-        # Only Factory - Trios has no uncertainty here
+        # Only Factory Trios has no uncertainty here
         if ConfigFile.settings['fL1bCal'] >= 2 or ConfigFile.settings['SensorType'].lower() == 'seabird':
             #or ConfigFile.settings['SensorType'].lower() == 'dalec':
             esUNC = xUNC[f'esUNC_{sensor}']  # should already be convolved to hyperspec
@@ -1182,7 +1182,7 @@ def ensemblesReflectance(node, sasGroup, refGroup, ancGroup, uncGroup,
             convolve_to_satellite['Sentinel3A'] = lambda sliceData: Weight_RSR.processSentinel3Bands(sliceData, sensor='A')
             satellite_bands['Sentinel3'] = Weight_RSR.Sentinel3Bands()
         if ConfigFile.settings['bL2WeightSentinel3B']:
-            convolve_to_satellite['Sentinel3A'] = lambda sliceData: Weight_RSR.processSentinel3Bands(sliceData, sensor='B')
+            convolve_to_satellite['Sentinel3B'] = lambda sliceData: Weight_RSR.processSentinel3Bands(sliceData, sensor='B')
             satellite_bands['Sentinel3'] = Weight_RSR.Sentinel3Bands()
 
         satellite_slice = {satellite: {k: convolve_to_satellite[satellite](sliceData) for k, sliceData in data_slice.items()}
@@ -1838,6 +1838,13 @@ def stationsEnsemblesReflectance(node, root, station=None):
                 if sixS_available:
                     filtering.filterDataL2(node.getGroup("SIXS_MODEL"), badTimes)
 
+            # Now address convolutions, if any, but don't remove those spectra (again), just 0 the UV and NIR
+            sensorList = ['bL2WeightMODISA','bL2WeightMODIST','bL2WeightSentinel3A','bL2WeightSentinel3B',
+                          'bL2WeightVIIRSN','bL2WeightVIIRSJ']
+            for satellite in sensorList:
+                if ConfigFile.settings[satellite]:
+                    ProcessL2.negReflectance(newReflectanceGroup,
+                                             'Rrs_'+satellite.split('bL2Weight')[1], VIS = fRange)
         return True
 
     @staticmethod