Merge branch 'dev'

Author: oceancolorcoder

.github/actions/SetupEnvironment/action.yml

@@ -29,7 +29,7 @@ runs:
       shell: bash -el {0}
       run: |
         mamba env update -n hypercp -f environment.yml
-        mamba install --channel=conda-forge pyinstaller==6.6
+        mamba install --channel=conda-forge pyinstaller
 
     - name: 📸 Capture Environment
       if: runner.os != 'Windows'
@@ -43,7 +43,7 @@ runs:
       shell: pwsh
       run: |
         mamba env update -n hypercp -f environment.yml
-        mamba install --channel=conda-forge pyinstaller==6.6
+        mamba install --channel=conda-forge pyinstaller
 
     - name: 📸 Capture Environment [Windows]
       if: runner.os == 'Windows'

Main.py

@@ -614,10 +614,16 @@ def __init__(
         super().__init__()
 
         # Confirm that core data files are in place. Download if necessary.
-        fpfZhang = os.path.join(CODE_HOME, "Data", "Zhang_rho_db.mat")
+        fpfZhang = os.path.join(CODE_HOME, "Data", "Zhang_rho_db_expanded.mat")
         if not os.path.exists(fpfZhang):
             Utilities.downloadZhangDB(fpfZhang, force=True)
 
+        # Confirm that core data files are in place. Download if necessary.
+        # fpfZhangLUT = os.path.join(CODE_HOME, "Data", "Zhang_rho_LUT.nc")
+        fpfZhangLUT = os.path.join(CODE_HOME, "Data", "Z17_LUT_v2.nc")
+        if not os.path.exists(fpfZhangLUT):
+            Utilities.downloadZhangLUT(fpfZhangLUT, force=True)
+
         # Create a default main config to be filled with cmd argument
         # to avoid reading the one generated with the GUI
         MainConfig.createDefaultConfig("cmdline_main.config", VERSION)

Source/ProcessInstrumentUncertainties.py

@@ -339,6 +339,8 @@ def ClassBased(self, node: HDFRoot, uncGrp: HDFGroup, stats: dict[str, np.array]
             ES_unc = es_unc / es
             LI_unc = li_unc / li
             LT_unc = lt_unc / lt
+            # if any(ES_unc < 0):
+            #     print('halt and catch fire')
 
         # interpolation step - bringing uncertainties to common wavebands from radiometric calibration wavebands.
         data_wvl = np.asarray(list(stats['ES']['std_Signal_Interpolated'].keys()),
@@ -2269,4 +2271,4 @@ def update_cal_rad(PANEL, S12_sl_corr, LAMP, int_time_t0, t1):
         ind_nocal = ind_nan | ind_zero
         updated_radcal_gain[
             ind_nocal == True] = 1  # set 1 instead of 0 to perform calibration (otherwise division per 0)
-        return updated_radcal_gain
+        return updated_radcal_gain

Tests/test_sample_data.py

@@ -46,7 +46,7 @@ def setUp(self):
         self.cfg_filename = os.path.join(root, "Config", "sample_SEABIRD_SOLARTRACKER.cfg")
         self.files = sorted(glob.glob(os.path.join(self.path_to_data, 'RAW', f'*.RAW')))
 
-    def test_pysas(self):
+    def test_seabird_solar_tracker(self):
         from Main import Command
         os.chdir(root)  # Need to switch to root as path in Config files are relative
         for file in self.files:

environment.yml

@@ -8,7 +8,7 @@ dependencies:
   - pyqt=5.15
   - requests=2.28
   - tqdm=4.65
-  - numpy=1.23
+  - numpy=1
   - h5py=3.7
   - pytz=2022.7
   - matplotlib
@@ -20,10 +20,11 @@ dependencies:
   - netcdf4=1.6
   - j6s
   - pytables=3.7
-  - pyspectral=0.12
+  - pyspectral=0.12.5
   - pyqtgraph
   - ocdb-client
   - pip
   - pip:
+    - comet_maths<=1.0.3
     - punpy
     - fpdf2