apps/Radx/RadxRate and RadxPid - Worker threads - fixing censoring of…

… non-weather gates
NCAR · Dec 28, 2022 · 6d38a83 · 6d38a83
1 parent 08e0285
commit 6d38a83
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/codebase/apps/Radx/src/RadxPid/Worker.cc b/codebase/apps/Radx/src/RadxPid/Worker.cc
@@ -487,16 +487,18 @@ void Worker::_censorNonWeather(RadxField &field)
 {
 
   const int *pid = _pid.getPid();
-  for (size_t ii = 0; ii < _nGates; ii++) {
-    int ptype = pid[ii];
-    if (ptype == NcarParticleId::FLYING_INSECTS ||
-        ptype == NcarParticleId::SECOND_TRIP ||
-        ptype == NcarParticleId::GROUND_CLUTTER ||
-        ptype < NcarParticleId::CLOUD ||
-        ptype > NcarParticleId::SATURATED_SNR) {
-      field.setGateToMissing(ii);
-    }
-  } // ii
+  for (size_t igate = 0; igate < _nGates; igate++) {
+    int ptype = pid[igate];
+    if (ptype <= 0) {
+      field.setGateToMissing(igate);
+    } else {
+      for (int it = 0; it < _params.non_weather_pid_types_n; it++) {
+        if (ptype == _params._non_weather_pid_types[it]) {
+          field.setGateToMissing(igate);
+        }
+      }  // it
+    } // if (ptype <= 0) 
+  } // igate
 
 }
 

diff --git a/codebase/apps/Radx/src/RadxRate/Worker.cc b/codebase/apps/Radx/src/RadxRate/Worker.cc
@@ -561,11 +561,15 @@ void Worker::_censorNonWeather(RadxField &field)
   const int *pid = _pid.getPid();
   for (size_t igate = 0; igate < _nGates; igate++) {
     int ptype = pid[igate];
-    for (int it = 0; it < _params.non_weather_pid_types_n; it++) {
-      if (ptype == _params._non_weather_pid_types[it]) {
-        field.setGateToMissing(igate);
-      }
-    }
+    if (ptype <= 0) {
+      field.setGateToMissing(igate);
+    } else {
+      for (int it = 0; it < _params.non_weather_pid_types_n; it++) {
+        if (ptype == _params._non_weather_pid_types[it]) {
+          field.setGateToMissing(igate);
+        }
+      }  // it
+    } // if (ptype <= 0) 
   } // igate
 
 }