Update README for MERRA2 model

README_configuration.md

@@ -190,6 +190,31 @@ when applying calibration to the dark current corrected radiometry, the offsets
 (see ProSoftUserManual7.7 11.1.1.5 Eqns 5-6) presuming light and dark factory cals are equivalent (which they
 historically have been from Satlantic/Sea-Bird).
 
+Use of the Mobley (1999) and Zhang et al. 2017 glint corrections require wind data, and Zhang (2017) also requires
+aerosol optical depth, salinity, and sea surface temperature. L1BQC processing also uses wind speed to filter the data
+for minimizing glint contamination. Since most field collections of above water radiometry are missing some or all of
+these ancillary parameters (though they can be input in the Ancillary file, if available), an embedded function allows
+the user to download model data from the NASA EARTHDATA server. These data are generated by the NASA Global Modeling and
+ Assimilation Office (GMAO) as hourly, global 'MERRA2' HDF files at 0.5 deg (latitude) by 0.625 deg (longitude)
+ resolution (https://gmao.gsfc.nasa.gov/reanalysis/MERRA-2/). Two files will be downloaded for each hour of data
+ processed (total ~8.3 MB for one hour of field data) and stored in /Data/Anc. Global ancillary data files from GMAO
+ will be reused, so it is not recommended to clear this directory unless updated models are being released by GMAO.
+ *(Note: MERRA2 files downloaded prior to March 15, 2022 can be deleted as the file name format has changed.)*
+ Details for how these data are applied to above water radiometry are given below.
+
+Access to GMAO MERRA2 data requires a user login and password, which can be obtained for free
+[here](https://www.earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/earthdata-login). A link to register is also provided in the Configuration window at L1BQC. When the user selects ```Download Ancillary Models```, pop-up windows will allow the user to enter a login and
+password. Once this has been done once, canceling the login pop-up dialog will force the program to use the current
+configuration (i.e. it is only necessary to re-enter the password if it has changed.)
+
+*Note: Global MERRA2 hourly ancillary model data are not available until the calendar month following the model date.* 
+This may lead to a 401 error if you are trying to acquire MERRA2 data within the month being processed. In this situation
+the user should switch to using the ECMWF model or the default fall-back values based on best estimates.
+
+These ancillary data from models will be incorporated if field data are not available in the Ancillary file provided
+in the Main window. If field data and model data are both inaccessible for any reason, the system will use the Default
+values (i.e., Wind Speed, AOD, Salinity, and SST) provided in the L1BQC Configuration setup here.
+
 Three calibration/characterization regimes are available:
 
 **Factory:**
@@ -255,28 +280,6 @@ Plotting is time and memory intensive, and can also add significant time to PDF
 Further quality control filters are applied to data prior to L2 ensemble binning and reflectance
 calculation.
 
-Use of the Mobley (1999) and Zhang et al. 2017 glint corrections require wind data, and Zhang (2017) also requires
-aerosol optical depth, salinity, and sea surface temperature. L1BQC processing also uses wind speed to filter the data
-for minimizing glint contamination. Since most field collections of above water radiometry are missing some or all of
-these ancillary parameters (though they can be input in the Ancillary file, if available), an embedded function allows
-the user to download model data from the NASA EARTHDATA server. These data are generated by the NASA Global Modeling and
- Assimilation Office (GMAO) as hourly, global 'MERRA2' HDF files at 0.5 deg (latitude) by 0.625 deg (longitude)
- resolution (https://gmao.gsfc.nasa.gov/reanalysis/MERRA-2/). Two files will be downloaded for each hour of data
- processed (total ~8.3 MB for one hour of field data) and stored in /Data/Anc. Global ancillary data files from GMAO
- will be reused, so it is not recommended to clear this directory unless updated models are being released by GMAO.
- *(Note: MERRA2 files downloaded prior to March 15, 2022 can be deleted as the file name format has changed.)*
- Details for how these data are applied to above water radiometry are given below.
-
-Access to these data requires a user login and password, which can be obtained for free
-[here](https://www.earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/earthdata-login). A link to register is also provided in the Configuration window
-at L1BQC. When the user selects ```Download Ancillary Models```, pop-up windows will allow the user to enter a login and
-password. Once this has been done once, canceling the login pop-up dialog will force the program to use the current
-configuration (i.e. it is only necessary to re-enter the password if it has changed.)
-
-These ancillary data from models will be incorporated if field data are not incorporated in the Ancillary file provided
-in the Main window. If field data and model data are both inaccessible for any reason, the system will use the Default
-values (i.e., Wind Speed, AOD, Salinity, and SST) provided in the L1BQC Configuration setup here.
-
 Individual spectra may be filtered out for:
 
 - **Lt(NIR)>Lt(UV)**: Spectra with Lt higher in the UV (average from 780-850) than the UV (350-400) are eliminated.

Source/RhoCorrections.py

@@ -37,7 +37,7 @@ def M99Corr(windSpeedMean, SZAMean, relAzMean, Propagate = None,
         inFilePath = os.path.join(PATH_TO_DATA, 'rhoTable_AO1999.hdf')
         try:
             lut = HDFRoot.readHDF5(inFilePath)
-        except:
+        except Exception:
             msg = "Unable to open M99 LUT."
             Utilities.errorWindow("File Error", msg)
             print(msg)