getting clemence's updates merged with mine

Author: pdevis

hypernets_processor/calibration/calibrate.py

@@ -259,8 +259,8 @@ def clip_and_mask(self, dataset, k_unc=3):
             ids = np.where(dataset['series_id'] == series_ids[i])
             intsig = np.nansum((dataset["digital_number"].values[:, ids]), axis=0)[0]
             noisestd, noiseavg = self.sigma_clip(intsig)
-            maski = np.ones_like(intsig)
-            maski[np.where(np.abs(intsig - noiseavg) >= k_unc * noisestd)] = 2
+            maski = np.zeros_like(intsig)
+            maski[np.where(np.abs(intsig - noiseavg) >= k_unc * noisestd)] = 1
             mask = np.append(mask, maski)
             # print("mask",mask)
 

hypernets_processor/surface_reflectance/measurement_functions/water_network_protocol.py

@@ -13,7 +13,7 @@ def function(self,upwelling_radiance,downwelling_radiance,irradiance,rhof,epsilo
 
         rhow_all = [r - epsilon for r in rhow_nosc_all]
 
-        return lw_all, rhow_nosc_all, rhow_all, epsilon
+        return lw_all, rhow_nosc_all, rhow_all
 
     @staticmethod
     def get_name():