Clean up config files and un-ignore on master

Author: oceancolorcoder

.gitignore

@@ -62,10 +62,10 @@ Data/Sample_Data/SoRad/*
 
 Config/* 
 # To update sample configurations, uncomment:
-# !Config/sample_*_Calibration/
-# !Config/sample_*.cfg
-# !Config/sample_*.hdr
-# !Config/sample_*.csv
+!Config/sample_*_Calibration/
+!Config/sample_*.cfg
+!Config/sample_*.hdr
+!Config/sample_*.csv
 
 ## To allow local changes to a file on remote, but not have those tracked:
 # git update-index --skip-worktree Config/sample_SEABIRD_pySAS.cfg

Config/sample_SEABIRD_pySAS.cfg

@@ -145,7 +145,7 @@
     "fL1bqcSpecFilterEs": 5.0,
     "fL1bqcSpecFilterLi": 8.0,
     "fL1bqcSpecFilterLt": 3.0,
-    "bL1bqcEnableQualityFlags": 0,
+    "bL1bqcEnableQualityFlags": 1,
     "fL1bqcCloudFlag": 1.0,
     "fL1bqcSignificantEsFlag": 2.0,
     "fL1bqcDawnDuskFlag": 1.0,
@@ -163,10 +163,10 @@
     "bL2SimpleNIRCorrection": 0,
     "bL2SimSpecNIRCorrection": 1,
     "bL2NegativeSpec": 1,
-    "bL2BRDF": 1,
+    "bL2BRDF": 0,
     "bL2BRDF_fQ": 0,
     "bL2BRDF_IOP": 0,
-    "bL2BRDF_O23": 1,
+    "bL2BRDF_O23": 0,
     "bL2WeightMODISA": 1,
     "bL2WeightSentinel3A": 0,
     "bL2WeightVIIRSN": 0,
@@ -182,8 +182,7 @@
     "seaBASSHeaderFileName": "sample_SEABIRD_pySAS.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 1,
-    "bL2EnableQualityFlags": 0,
-    "FidRadDB": 1,
+    "bL2EnableQualityFlags": 1,
     "bL2PlotProd": 1,
     "bL2Prodoc3m": 1,
     "bL2Prodkd490": 0,
@@ -193,10 +192,10 @@
     "bL2Prodavw": 1,
     "bL2Prodqwip": 1,
     "bL2ProdweiQA": 0,
-    "bL2Prodgocad": 1,
-    "bL2Prodag": 1,
-    "bL2ProdSg": 1,
-    "bL2ProdDOC": 1,
+    "bL2Prodgocad": 0,
+    "bL2Prodag": 0,
+    "bL2ProdSg": 0,
+    "bL2ProdDOC": 0,
     "bL2Prodgiop": 0,
     "bL2ProdaGiop": 0,
     "bL2ProdadgGiop": 0,
@@ -206,12 +205,12 @@
     "bL2ProdbbGiop": 0,
     "bL2ProdbbpGiop": 0,
     "bL2ProdbbpSGiop": 0,
-    "bL2Prodqaa": 1,
+    "bL2Prodqaa": 0,
     "bL2ProdaQaa": 0,
-    "bL2ProdadgQaa": 1,
+    "bL2ProdadgQaa": 0,
     "bL2ProdaphQaa": 0,
     "bL2ProdbQaa": 0,
     "bL2ProdbbQaa": 0,
-    "bL2ProdbbpQaa": 1,
+    "bL2ProdbbpQaa": 0,
     "bL2ProdcQaa": 0
 }

Config/sample_SEABIRD_pySAS.hdr

@@ -33,8 +33,8 @@
     "nadir": "40",
     "rho_correction": "M99",
     "NIR_residual_correction": "R06",
-    "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-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 = 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",
+    "BRDF_correction": "noBRDF",
+    "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-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"

Config/sample_TRIOS_NOTRACKER.cfg

@@ -3,26 +3,39 @@
     "outDir": "./Data",
     "ancFileDir": "./Data/Sample_Data",
     "ancFile": "",
-    "CalibrationFiles": {},
-    "SensorType": "SeaBird",
+    "CalibrationFiles": {
+        "SAM_8329.ini": {
+            "enabled": true,
+            "frameType": "ES"
+        },
+        "SAM_8166.ini": {
+            "enabled": true,
+            "frameType": "LI"
+        },
+        "SAM_8595.ini": {
+            "enabled": true,
+            "frameType": "LT"
+        }
+    },
+    "SensorType": "TriOS",
     "fL1aUTCOffset": 0.0,
     "bL1aCleanSZA": 1,
     "fL1aCleanSZAMax": 70.0,
     "bL1aCOD": 0,
-    "bL1aqcSunTracker": 1,
-    "bL1aqcCleanPitchRoll": 1,
+    "bL1aqcSunTracker": 0,
+    "bL1aqcCleanPitchRoll": 0,
     "fL1aqcPitchRollPitch": 5.0,
     "fL1aqcPitchRollRoll": 5.0,
     "fL1aqcRotatorHomeAngle": 0.0,
-    "bL1aqcRotatorDelay": 1,
+    "bL1aqcRotatorDelay": 0,
     "fL1aqcRotatorDelay": 2.0,
     "bL1aqcRotatorAngle": 0,
     "fL1aqcRotatorAngleMin": -40.0,
     "fL1aqcRotatorAngleMax": 40.0,
     "bL1aqcCleanSunAngle": 1,
     "fL1aqcSunAngleMin": 90.0,
     "fL1aqcSunAngleMax": 135.0,
-    "bL1aqcDeglitch": 1,
+    "bL1aqcDeglitch": 0,
     "fL1aqcESWindowDark": 11,
     "fL1aqcESWindowLight": 5,
     "fL1aqcESSigmaDark": 3.2,
@@ -55,7 +68,7 @@
     "fL1aqcLTMinMaxBandDark": null,
     "fL1aqcLTMinMaxBandLight": null,
     "fL1aqcAnomalyStep": 20,
-    "bL1bGetAnc": 0,
+    "bL1bGetAnc": 1,
     "fL1bDefaultWindSpeed": 5.0,
     "fL1bDefaultAOD": 0.2,
     "fL1bDefaultAirT": 26.0,
@@ -75,7 +88,7 @@
     "chooseCal_LT": null,
     "chooseCal_LI": null,
     "fL1bInterpInterval": 3.3,
-    "bL1bPlotTimeInterp": 0,
+    "bL1bPlotTimeInterp": 1,
     "fL1bPlotInterval": 20.0,
     "bL1bqcLtUVNIR": 1,
     "fL1bqcMaxWind": 10.0,
@@ -86,7 +99,7 @@
     "fL1bqcSpecFilterEs": 5.0,
     "fL1bqcSpecFilterLi": 8.0,
     "fL1bqcSpecFilterLt": 3.0,
-    "bL1bqcEnableQualityFlags": 0,
+    "bL1bqcEnableQualityFlags": 1,
     "fL1bqcCloudFlag": 1.0,
     "fL1bqcSignificantEsFlag": 2.0,
     "fL1bqcDawnDuskFlag": 1.0,
@@ -106,7 +119,7 @@
     "bL2NegativeSpec": 1,
     "bL2BRDF": 0,
     "bL2BRDF_fQ": 0,
-    "bL2BRDF_IOP": 1,
+    "bL2BRDF_IOP": 0,
     "bL2BRDF_O23": 0,
     "bL2WeightMODISA": 1,
     "bL2WeightSentinel3A": 0,
@@ -123,16 +136,15 @@
     "seaBASSHeaderFileName": "sample_TRIOS_NOTRACKER.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 0,
-    "bL2EnableQualityFlags": 0,
-    "FidRadDB": 1,
+    "bL2EnableQualityFlags": 1,
     "bL2PlotProd": 1,
     "bL2Prodoc3m": 1,
     "bL2Prodkd490": 0,
     "bL2Prodpic": 0,
     "bL2Prodpoc": 0,
     "bL2Prodipar": 0,
-    "bL2Prodavw": 0,
-    "bL2Prodqwip": 0,
+    "bL2Prodavw": 1,
+    "bL2Prodqwip": 1,
     "bL2ProdweiQA": 0,
     "bL2Prodgocad": 0,
     "bL2Prodag": 0,

Config/sample_TRIOS_NOTRACKER.hdr

@@ -0,0 +1,41 @@
+{
+    "version": "R1",
+    "investigators": "Giorgio_DallOlmo",
+    "affiliations": "Plymouth_Marine_Laboratory",
+    "contact": "[email protected]",
+    "experiment": "FRM4SOC2",
+    "cruise": "FICE22",
+    "platform": "AAOT",
+    "documents": "README.md",
+    "instrument_manufacturer": "TriOS",
+    "instrument_model": "RAMSES",
+    "calibration_date": "20220101",
+    "calibration_files": "Back_SAM_8166.dat,Cal_SAM_8166.dat,SAM_8329.ini,Back_SAM_8329.dat,Cal_SAM_8329.dat,SAM_8166.ini,SAM_8595.ini,Back_SAM_8595.dat,Cal_SAM_8595.dat",
+    "data_type": "above_water",
+    "data_status": "preliminary",
+    "water_depth": "NA",
+    "measurement_depth": "0",
+    "cloud_percent": "NA",
+    "wave_height": "NA",
+    "secchi_depth": "NA",
+    "wind_speed": "NA",
+    "station": "",
+    "data_file_name": "",
+    "original_file_name": "",
+    "start_date": "",
+    "end_date": "",
+    "start_time": "",
+    "end_time": "",
+    "north_latitude": "",
+    "south_latitude": "",
+    "east_longitude": "",
+    "west_longitude": "",
+    "nadir": "40",
+    "rho_correction": "M99",
+    "NIR_residual_correction": "R06",
+    "BRDF_correction": "noBRDF",
+    "comments": "! HyperInSPACE vers = 1.2.14b\n! HyperInSPACE Config = sample_TRIOS_NOTRACKER.cfg\n! Rotator Home Angle = 0.0\n! Rotator Delay = 2.0\n! Pitch/Roll Filter = Off\n! Max Pitch/Roll = 5.0\n! Rotator Min/Max Filter = Off\n! Rotator Min = -40.0\n! Rotator Max = 40.0\n! Rel Azimuth Filter = On\n! Rel Azimuth Min = 90.0\n! Rel Azimuth Max = 135.0\n! Deglitch Filter = Off\n! ES Dark Window = 11\n! ES Light Window = 5\n! ES Dark Sigma = 3.2\n! ES Light Sigma = 2.3\n! LI Dark Window = 11\n! LI Light Window = 5\n! LI Dark Sigma = 3.3\n! LI Light Sigma = 3.0\n! LT Dark Window = 11\n! LT Light Window = 13\n! LT Dark Sigma = 3.2\n! LT Light Sigma = 2.7\n! FRM Pathway = Factory_Calibration\n! Thermal Source = Internal_Thermistor\n! Default Salt = 35.0\n! Default SST = 26.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! Other comments...\n!",
+    "missing": -9999,
+    "delimiter": "comma"
+}