Patch language dependancy issues with TIME-STAMP in root.attributes

Author: oceancolorcoder

Config/sample_SEABIRD_pySAS.cfg

@@ -1,6 +1,6 @@
 {
-    "inDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/pySAS/Full_M99",
-    "outDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/pySAS/Full_M99",
+    "inDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/pySAS/Class_M99",
+    "outDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/pySAS/Class_M99",
     "ancFileDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/pySAS",
     "ancFile": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/pySAS/FICE22_pySAS_Ancillary.sb",
     "CalibrationFiles": {
@@ -101,7 +101,7 @@
     "fL1bDefaultAirT": 26.0,
     "fL1bDefaultSalt": 38.0,
     "fL1bDefaultSST": 28.0,
-    "fL1bCal": 3,
+    "fL1bCal": 2,
     "fL1bThermal": 1,
     "neededCalCharsFRM": {
         "LI": [
@@ -178,10 +178,11 @@
     "bL2PlotEs": 1,
     "bL2PlotLi": 1,
     "bL2PlotLt": 1,
-    "bL2UncertaintyBreakdownPlot": 0,
+    "bL2UncertaintyBreakdownPlot": 1,
     "seaBASSHeaderFileName": "sample_SEABIRD_pySAS.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 1,
+    "bL2filterMetFlags": 0,
     "bL2EnableQualityFlags": 1,
     "bL2PlotProd": 1,
     "bL2Prodoc3m": 1,

Config/sample_SEABIRD_pySAS.hdr

@@ -34,7 +34,7 @@
     "rho_correction": "M99",
     "NIR_residual_correction": "MA95",
     "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",
+    "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 = 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

@@ -1,6 +1,6 @@
 {
-    "inDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/Manual_TriOS/Class",
-    "outDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/Manual_TriOS/Class",
+    "inDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/Manual_TriOS/Full",
+    "outDir": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/Manual_TriOS/Full",
     "ancFileDir": "./Data/Sample_Data",
     "ancFile": "/Users/daurin/GitRepos/HyperCP/Data/Sample_Data/Manual_TriOS/FICE22_TriOS_Ancillary.sb",
     "CalibrationFiles": {
@@ -77,7 +77,7 @@
     "fL1bDefaultAirT": 26.0,
     "fL1bDefaultSalt": 35.0,
     "fL1bDefaultSST": 26.0,
-    "fL1bCal": 2,
+    "fL1bCal": 3,
     "fL1bThermal": 1,
     "neededCalCharsFRM": {
         "ES": [
@@ -158,6 +158,7 @@
     "seaBASSHeaderFileName": "sample_TRIOS_NOTRACKER.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 0,
+    "bL2filterMetFlags": 0,
     "bL2PlotProd": 1,
     "bL2Prodoc3m": 1,
     "bL2Prodkd490": 0,

Config/sample_TRIOS_NOTRACKER.hdr

@@ -34,7 +34,7 @@
     "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 = FRM_Class-based\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",
+    "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 = FRM-Full-Characterization\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"

Source/ConfigWindow.py

@@ -600,7 +600,7 @@ def initUI(self):
         l2UncertaintyBreakdownPlotsLabel = QtWidgets.QLabel("Unc. Plots (class-based only)", self)
         # l2UncertaintyBreakdownPlotLabel = QtWidgets.QLabel(" ", self)
         self.l2UncertaintyBreakdownPlotCheckBox = QtWidgets.QCheckBox("", self)
-        if int(ConfigFile.settings["bL2UncertaintyBreakdownPlot"]) == 1:
+        if ConfigFile.settings["bL2UncertaintyBreakdownPlot"]:
             self.l2UncertaintyBreakdownPlotCheckBox.setChecked(True)
 
         self.l2StationsCheckBox.clicked.connect(self.l2StationsCheckBoxUpdate)

Source/ProcessL1b.py

@@ -157,7 +157,10 @@ def read_FidRadDB_cal_char_files(root):
         # print(f"Root attribute TIME-STAMP: {root.attributes['TIME-STAMP']}")
         # acq_time_seconds = datetime.strptime(root.attributes['TIME-STAMP'], '%a %b %d %H:%M:%S %Y').timestamp()
         # Alternative: Grab start time of Es
-        esDatetime = root.getGroup('ES').datasets['DATETIME'].data[0]
+        if ConfigFile.settings['SensorType'] .lower() == 'seabird':
+            esDatetime = root.getGroup('ES_LIGHT').datasets['DATETIME'].data[0]
+        else:
+            esDatetime = root.getGroup('ES').datasets['DATETIME'].data[0]
         acq_time_seconds = esDatetime.timestamp()
 
         # Check which cal/char files are needed for each of the 3 sensor types (ES, LT, LI) in cal/char regime = Full, i.e. ConfigFile.settings["fL1bCal"] == 3

Source/ProcessL2.py

@@ -1493,7 +1493,9 @@ def _sliceRawData(ES_raw, LI_raw, LT_raw):
                                 stats, np.array(waveSubset, float)))  # instrument_WB
                 xUNC.update(instrument.FRM_L2(rhoScalar, rhoVec, rhoUNC, waveSubset, xSlice))
 
-                if ConfigFile.settings['bL2UncertaintyBreakdownPlot']:
+                # NOTE: Block for FRM-Full for now
+                if ConfigFile.settings['bL2UncertaintyBreakdownPlot'] and\
+                    ConfigFile.settings['fL1bCal'] == 2:
                     from Source.Uncertainty_Visualiser import UncertaintyGUI
                     gui = UncertaintyGUI()
                     gui.plot_FRM(