debugging water flag - should all work now

Author: clemgoyens

hypernets_processor/data_io/format/header.py

@@ -3,7 +3,7 @@
 """
 
 HEADER_DEF = [(2, "Total Dataset Length", '<H'),
-             (1, "Spectrum Type Information", '<c'),
+             (1, "Spectrum Type Information", '<B'),
              (8, "acquisition_time", '<Q'),
              (2, "integration_time", '<H'),
              (4, "temperature", '<f'),
@@ -13,4 +13,4 @@
              (2, "acceleration_y_mean", '<h'),
              (2, "acceleration_y_std", '<h'),
              (2, "acceleration_z_mean", '<h'),
-             (2, "acceleration_z_std", '<h')]
+             (2, "acceleration_z_std", '<h')]

hypernets_processor/etc/job.config

@@ -3,7 +3,7 @@ job_name = run_20201028T150017
 job_working_directory = C:\Users\pdv\.hypernets\tmp
 
 #SEQ20201016T141413
-sequence_id: SEQ20200821T154756
+sequence_id: SEQ20201016T142212
 Lat: 43.69886
 Lon: 7.30720
 site_abbr: test

hypernets_processor/etc/job_CG.config

@@ -1,15 +1,16 @@
 [Job]
-job_name = run_20201028T150017
+job_name = run_SEQ20201016T141413
 job_working_directory = home/cgoyens/.hypernets/tmp
 
 #SEQ20201016T141413
-sequence_id: SEQ20200821T154756
+# SEQ20201105T153301
+sequence_id: SEQ20201016T141413
 Lat: 43.69886
 Lon: 7.30720
 site_abbr: test
 
 [Input]
-raw_data_directory = /home/cgoyens/OneDrive/BackUpThinkpadClem/Projects/HYPERNETS/NetworkDesign_D52/DataProcChain/hypernets_processor/hypernets_processor/data_io/tests/reader/SEQ20200821T154756
+raw_data_directory = /home/cgoyens/OneDrive/BackUpThinkpadClem/Projects/HYPERNETS/NetworkDesign_D52/DataProcChain/hypernets_processor/hypernets_processor/data_io/tests/reader/SEQ20201016T141413
 [Log]
 log_path = test.log
 verbose = True
@@ -20,12 +21,12 @@ network = w
 
 [Output]
 product_format = netcdf
-write_l0 = False
-write_l1a = False
+write_l0 = True
+write_l1a = True
 write_l1b = True
-write_l1c = False
+write_l1c = True
 write_l2a = True
-archive_directory = home/cgoyens/OneDrive/BackUpThinkpadClem/Projects/HYPERNETS/NetworkDesign_D52/DataProcChain/hypernets_processor/hypernets_processor/test_hypernets
+archive_directory = ./out/
 
 
 [Plotting]

hypernets_processor/etc/processor.config

@@ -73,16 +73,16 @@ test_var_wave: 780
 test_var_threshold: 0.10
 
 [Output]
-write_l0: False
+write_l0: True
 write_l1a: True
-write_l1b: False
-write_l1c: False
+write_l1b: True
+write_l1c: True
 write_l2a: True
 
-plot_l0: False
-plot_l1a: False
+plot_l0: True
+plot_l1a: True
 plot_l1b: True
-plot_l1c: False
+plot_l1c: True
 plot_l2a: True
 
 [Flags]

hypernets_processor/rhymer/rhymer/hypstar/rhymer_hypstar.py

@@ -357,9 +357,9 @@ def qc_similarity(self, wave, data, wr=670, wp=0.05, w1=720, w2=780, alpha=2.35,
         epsilon = (alpha * data[iref2] - data[iref1]) / (alpha - 1.0)
 
         if abs(epsilon) > wp * data[irefr]:
-            return (True, epsilon)
+            return (1, epsilon)
         else:
-            return (False, epsilon)
+            return (0, epsilon)
 
     def process_l1b(self, L1a_rad, L1a_irr):
 

hypernets_processor/surface_reflectance/surface_reflectance.py

@@ -47,9 +47,8 @@ def process_l1d(self, dataset_l1c):
                                                   dataset_l1d["wavelength"].values)
             dataset_l1d["epsilon"].values = epsilon
 
-            dataset_l1d["quality_flag"][dataset_l1d["scan"] == [i for i, x in enumerate(failSimil) if x]] = DatasetUtil.set_flag(
-                dataset_l1d["quality_flag"][dataset_l1d["scan"] == [i for i, x in enumerate(failSimil) if x]],
-                "simil_fail")
+            dataset_l1d["quality_flag"][np.where(failSimil == 1)] = DatasetUtil.set_flag(
+                dataset_l1d["quality_flag"][np.where(failSimil == 1)], "simil_fail")  # for i in range(len(mask))]
 
             input_vars = l1ctol1d_function.get_argument_names()
             input_qty = self.find_input(input_vars, dataset_l1d)