Update version to 1.2.8 prior to master promotion

Config/sample_SEABIRD_pySAS.cfg

@@ -97,7 +97,7 @@
     "fL1bDefaultAOD": 0.2,
     "fL1bDefaultSalt": 38.0,
     "fL1bDefaultSST": 28.0,
-    "bL1bCal": 2,
+    "bL1bCal": 3,
     "FullCalDir": "Config/sample_SEABIRD_pySAS_Calibration",
     "RadCalDir": "Config/sample_SEABIRD_pySAS_Calibration",
     "FidRadDB": false,
@@ -148,6 +148,7 @@
     "seaBASSHeaderFileName": "sample_SEABIRD_pySAS.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 1,
+    "bL1b_InterpPlotTimeInterp": 1,
     "bL2EnableQualityFlags": 1,
     "bL2Prodoc3m": 1,
     "bL2Prodkd490": 0,

Config/sample_SEABIRD_pySAS.hdr

@@ -34,7 +34,7 @@
     "rho_correction": "M99",
     "NIR_residual_correction": "R06",
     "BRDF_correction": "L11",
-    "comments": "! HyperInSPACE vers = 1.2.7\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 = 90.0\n! Rel Azimuth Max = 135.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.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! 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.7\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 = 90.0\n! Rel Azimuth Max = 135.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.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! 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

@@ -69,7 +69,7 @@
     "fL1bDefaultAOD": 0.2,
     "fL1bDefaultSalt": 38.0,
     "fL1bDefaultSST": 28.0,
-    "bL1bCal": 2,
+    "bL1bCal": 3,
     "FullCalDir": "Config/sample_TRIOS_NOTRACKER_Calibration",
     "RadCalDir": "Config/sample_TRIOS_NOTRACKER_Calibration",
     "FidRadDB": false,
@@ -102,9 +102,9 @@
     "bL2SimpleNIRCorrection": 0,
     "bL2SimSpecNIRCorrection": 1,
     "bL2NegativeSpec": 1,
-    "bL2BRDF": 0,
+    "bL2BRDF": 1,
     "bL2BRDF_fQ": 0,
-    "bL2BRDF_IOP": 0,
+    "bL2BRDF_IOP": 1,
     "bL2WeightMODISA": 1,
     "bL2WeightSentinel3A": 0,
     "bL2WeightVIIRSN": 0,
@@ -120,6 +120,7 @@
     "seaBASSHeaderFileName": "sample_TRIOS_NOTRACKER.hdr",
     "bL2SaveSeaBASS": 1,
     "bL2WriteReport": 1,
+    "bL1b_InterpPlotTimeInterp": 1,
     "bL2EnableQualityFlags": 1,
     "bL2Prodoc3m": 0,
     "bL2Prodkd490": 0,

Config/sample_TRIOS_NOTRACKER.hdr

@@ -33,8 +33,8 @@
     "nadir": "40",
     "rho_correction": "M99",
     "NIR_residual_correction": "R06",
-    "BRDF_correction": "NoBRDF",
-    "comments": "! HyperInSPACE vers = 1.2.7\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! 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": "L11",
+    "comments": "! HyperInSPACE vers = 1.2.7\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! 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! Sample dataset for TriOS triplet with no GPS or sun tracker.\n! FRM4SOC-2 Field InterComparison Experiment (FICE)\n! July 11 - 21, 2022\n! Acqua Alta Oceanographic Tower (AAOT), CNR-ISMAR\n! \n! RelAz refer to solar-sensor relative azimuth angle.\n! Manually operated TriOS triplet. Height: ~15 m, Tower color: Red/yellow.\n!",
     "missing": -9999,
     "delimiter": "comma"

Main.py

@@ -30,7 +30,7 @@
 from Source.SeaBASSHeaderWindow import SeaBASSHeaderWindow
 from Source.Utilities import Utilities
 
-VERSION = "1.2.7"
+VERSION = "1.2.8"
 
 
 class Window(QtWidgets.QWidget):
@@ -439,14 +439,16 @@ def processSingle(self, lvl):
 
         if lvl == "L1A":
             inLevel = "raw"
-        if lvl == "L1AQC":
+        elif lvl == "L1AQC":
             inLevel = "L1A"
-        if lvl == "L1B":
+        elif lvl == "L1B":
             inLevel = "L1AQC"
-        if lvl == "L1BQC":
+        elif lvl == "L1BQC":
             inLevel = "L1B"
-        if lvl == "L2":
+        elif lvl == "L2":
             inLevel = "L1BQC"
+        else:
+            inLevel = None
 
         # Check for subdirectory associated with level chosen
         subInputDir = os.path.join(self.inputDirectory, inLevel)

README.md

@@ -13,7 +13,7 @@ retrieval. Data outputs are formatted to text files for submission to the [SeaBA
 Currently, HyperCP supports <a href='https://www.seabird.com/'>Sea-Bird Scientific</a> HyperSAS packages with and
 without SolarTracker or pySAS robotic platforms as well as [TriOS](https://www.trios.de/en/radiometers.html) used in manual configuration. If you are interested in integrating support for your platform, contact us at the email addresses below or in the Discussions tab of the GitHub repository.
 
-## Version 1.2.7
+## Version 1.2.8
 
 ```
 The MIT license

run_Sample_Data.py

@@ -29,16 +29,16 @@
 
 ################################################### CUSTOM SET UP ###################################################
 # Batch options
-MULTI_TASK = False  # Multiple threads for HyperSAS (any level) or TriOS (only L1A and up)
-MULTI_LEVEL = True  # Process raw (L0) to Level-2 (L2)
+MULTI_TASK = True  # Multiple threads for HyperSAS (any level) or TriOS (only L1A and up)
+MULTI_LEVEL = False  # Process raw (L0) to Level-2 (L2)
 CLOBBER = True      # True overwrites existing files
-PROC_LEVEL = "L2"   # Process to this level: L1A, L1AQC, L1B, LBQC, L2 (ignored for MULTI_LEVEL)
+PROC_LEVEL = "L1A"   # Process to this level: L1A, L1AQC, L1B, LBQC, L2 (ignored for MULTI_LEVEL)
 
 # Dataset options
-PLATFORM = "pySAS"
-# PLATFORM = "Manual_TriOS"
-INST_TYPE = "SEABIRD"  # SEABIRD or TRIOS; defines raw file naming
-# INST_TYPE = "TRIOS"
+# PLATFORM = "pySAS"
+PLATFORM = "Manual_TriOS"
+# INST_TYPE = "SEABIRD"  # SEABIRD or TRIOS; defines raw file naming
+INST_TYPE = "TRIOS"
 CRUISE = "FICE22"
 # L1B_REGIME: Optional. [Default, Class, Full]
 #   Denote FRM processing regime and use appropriately named subdirectories.
@@ -56,9 +56,14 @@
 PATH_DATA = os.path.join(PATH_HCP,'Data','Sample_Data',PLATFORM)
 ##################################
 
-PATH_ANC = os.path.join(
-    PATH_DATA, f"{CRUISE}_{PLATFORM}_Ancillary.sb",
-)
+if PLATFORM.lower == "Manual_TriOS":
+    PATH_ANC = os.path.join(
+        PATH_DATA, f"{CRUISE}_TriOS_Ancillary.sb",
+    )
+else:
+    PATH_ANC = os.path.join(
+        PATH_DATA, f"{CRUISE}_{PLATFORM}_Ancillary.sb",
+    )
 
 if MULTI_LEVEL or PROC_LEVEL == "L1A":
     PATH_INPUT = PATH_DATA