Merge pull request #13 from SWOT-Confluence/update_perm_relax_filter

Update filtering to permissive relax filter

Author: bpachev

prediagnostics/apply_flags_node.R

@@ -5,7 +5,7 @@
 #'
 #' @return dataframe of node-level data
 apply_flags_node=function(data, ice_max, dark_max, xover_cal_q_max, 
-                           prior_width_min,target_bit_node,cross_track_dist_min_m,
+                           prior_node_width_min_m,target_bit_node,cross_track_dist_min_m,
                           cross_track_dist_max_m, n_node_pix_min
                          ) {
 
@@ -66,7 +66,7 @@ apply_flags_node=function(data, ice_max, dark_max, xover_cal_q_max,
     ice_flag = +(ice_flag <= ice_max)
     dark_flag = +(dark_flag <= dark_max)
     xover_flag = +(xover_flag <= xover_cal_q_max)
-    prior_width_flag = +(prior_width >= prior_width_min)
+    prior_width_flag = +(prior_width >= prior_node_width_min_m)
     #in node mode, we need to apply bitwiser to all elements of the matrix
     bitwise_flag_node=matrix(nrow=nrow(bitwise_flag),ncol=ncol(bitwise_flag))
     good_pix_flag= +(n_good_pix >= n_node_pix_min)

prediagnostics/apply_flags_reach.R

@@ -9,7 +9,7 @@
 #'
 #' @return dataframe of reach data
 apply_flags_reach=function(data, ice_max, dark_max, xover_cal_q_max, 
-                           prior_width_min,target_bit_reach,cross_track_dist_min_m,
+                           prior_reach_width_min_m,target_bit_reach,cross_track_dist_min_m,
                            cross_track_dist_max_m,reach_length_min_m,
                            obs_frac_min){ 
     #deprecated inputs ,slope_r_u_max,wse_r_u_max  v0002
@@ -72,7 +72,7 @@ apply_flags_reach=function(data, ice_max, dark_max, xover_cal_q_max,
     ice_flag = +(ice_flag <= ice_max)
     dark_flag = +(dark_flag <= dark_max)
     xover_flag = +(xover_flag <= xover_cal_q_max)
-    prior_width_flag = +(prior_width >= prior_width_min)
+    prior_width_flag = +(prior_width >= prior_reach_width_min_m)
 
     #make a matrix of bitwise filtered data
     bitwise_flag = do.call(cbind,lapply(bitwise_flag,bitwiser,target_bit_in= target_bit_reach))

prediagnostics/config.R

@@ -1,17 +1,36 @@
 
-# Jan 13 2025 v "Montpellier" params
+
+# October 13 2025 v "Permissive relax" params
 GLOBAL_PARAMS = list (
-     prior_width_min_m = 80 ,
+     prior_reach_width_min_m = 60 ,
+     prior_node_width_min_m = 70 ,
      prior_slope_min = 3.4e-5,
-     reach_length_min_m=7000,
+     reach_length_min_m=5000,
      cross_track_dist_min_m= 10000,
      cross_track_dist_max_m= 60000,
-     ice_max = 0,
+     ice_max = 1,
      target_bit_reach= 507510784, #FUNCTIONALLY EQUIVALENT TO _q<=2
      target_bit_node=  532680192 , #adds flags 9,10, 11, 23, and 24 to the reach
-     dark_max = 0.4,
-     obs_frac_min= 0.5,
+     dark_max = 0.6,
+     obs_frac_min= 0.4,
      xover_cal_q_max = 1,
      Tukey_number = 1.5,
      n_node_pix_min =10
 )
+
+# # Jan 13 2025 v "Montpellier" params
+# GLOBAL_PARAMS = list (
+#      prior_width_min_m = 80 ,
+#      prior_slope_min = 3.4e-5,
+#      reach_length_min_m=7000,
+#      cross_track_dist_min_m= 10000,
+#      cross_track_dist_max_m= 60000,
+#      ice_max = 0,
+#      target_bit_reach= 507510784, #FUNCTIONALLY EQUIVALENT TO _q<=2
+#      target_bit_node=  532680192 , #adds flags 9,10, 11, 23, and 24 to the reach
+#      dark_max = 0.4,
+#      obs_frac_min= 0.5,
+#      xover_cal_q_max = 1,
+#      Tukey_number = 1.5,
+#      n_node_pix_min =10
+# )

prediagnostics/prediagnostics.R

@@ -44,7 +44,7 @@ run_diagnostics <- function(input_dir, reaches_json, index, output_dir) {
                                          ice_max=GLOBAL_PARAMS$ice_max, 
                                          dark_max=GLOBAL_PARAMS$dark_max, 
                                          xover_cal_q_max=GLOBAL_PARAMS$xover_cal_q_max, 
-                                         prior_width_min=GLOBAL_PARAMS$prior_width_min, 
+                                         prior_reach_width_min_m=GLOBAL_PARAMS$prior_reach_width_min_m, 
                                          target_bit_reach=GLOBAL_PARAMS$target_bit_reach, 
                                          cross_track_dist_min_m=GLOBAL_PARAMS$cross_track_dist_min_m, 
                                          cross_track_dist_max_m=GLOBAL_PARAMS$cross_track_dist_max_m,
@@ -58,7 +58,7 @@ run_diagnostics <- function(input_dir, reaches_json, index, output_dir) {
                                          ice_max=GLOBAL_PARAMS$ice_max, 
                                          dark_max=GLOBAL_PARAMS$dark_max, 
                                          xover_cal_q_max=GLOBAL_PARAMS$xover_cal_q_max, 
-                                         prior_width_min=GLOBAL_PARAMS$prior_width_min, 
+                                         prior_node_width_min_m=GLOBAL_PARAMS$prior_node_width_min_m, 
                                          target_bit_node=GLOBAL_PARAMS$target_bit_node, 
                                          cross_track_dist_min_m=GLOBAL_PARAMS$cross_track_dist_min_m,
                                          cross_track_dist_max_m=GLOBAL_PARAMS$cross_track_dist_max_m,