Merge branch 'dev'

Author: oceancolorcoder

Config/sample_SEABIRD_pySAS.cfg

@@ -99,13 +99,13 @@
     "fL1aqcLTMinMaxBandDark": null,
     "fL1aqcLTMinMaxBandLight": null,
     "fL1aqcAnomalyStep": 20,
-    "bL1bGetAnc": 1,
+    "bL1bGetAnc": 2,
     "fL1bDefaultWindSpeed": 5.0,
     "fL1bDefaultAOD": 0.2,
     "fL1bDefaultAirT": 26.0,
     "fL1bDefaultSalt": 38.0,
     "fL1bDefaultSST": 28.0,
-    "fL1bCal": 3,
+    "fL1bCal": 2,
     "fL1bThermal": 1,
     "neededCalCharsFRM": {
         "LI": [
@@ -145,11 +145,11 @@
     "fL1bqcSZAMin": 20.0,
     "fL1bqcSZAMax": 60.0,
     "bL1bqcEnableSpecQualityCheck": 1,
-    "bL1bqcEnableSpecQualityCheckPlot": 0,
+    "bL1bqcEnableSpecQualityCheckPlot": 1,
     "fL1bqcSpecFilterEs": 5.0,
     "fL1bqcSpecFilterLi": 8.0,
     "fL1bqcSpecFilterLt": 3.0,
-    "bL1bqcEnableQualityFlags": 1,
+    "bL1bqcEnableQualityFlags": 0,
     "fL1bqcCloudFlag": 1.0,
     "fL1bqcSignificantEsFlag": 2.0,
     "fL1bqcDawnDuskFlag": 1.0,
@@ -167,10 +167,10 @@
     "bL2SimpleNIRCorrection": 0,
     "bL2SimSpecNIRCorrection": 1,
     "bL2NegativeSpec": 1,
-    "bL2BRDF": 0,
+    "bL2BRDF": 1,
     "bL2BRDF_fQ": 0,
     "bL2BRDF_IOP": 0,
-    "bL2BRDF_O23": 0,
+    "bL2BRDF_O23": 1,
     "bL2WeightMODISA": 1,
     "bL2WeightSentinel3A": 0,
     "bL2WeightVIIRSN": 0,
@@ -186,14 +186,7 @@
     "seaBASSHeaderFileName": "sample_SEABIRD_pySAS.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 1,
-    "bL2EnableQualityFlags": 1,
-<<<<<<< HEAD
-=======
-    "FidRadDB": 1,
-    "bL2filterMetFlags": 0,
-    "sL1aqcphotoFormat": "%Y%m%d_%H%M%S.jpg+0300",
->>>>>>> dev
-    "bL2PlotProd": 0,
+    "bL2PlotProd": 1,
     "bL2Prodoc3m": 1,
     "bL2Prodkd490": 0,
     "bL2Prodpic": 0,

Config/sample_SEABIRD_pySAS.hdr

@@ -33,8 +33,8 @@
     "nadir": "40",
     "rho_correction": "M99",
     "NIR_residual_correction": "R06",
-    "BRDF_correction": "noBRDF",
-    "comments": "! HyperInSPACE vers = 1.2.14\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",
+    "BRDF_correction": "O23",
+    "comments": "! HyperInSPACE vers = 1.2.14b\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_Class-based\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 = Off\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"