#1942 Added seeps_mpr and removed seeps_sa & seeps_ta

dtcenter · Sep 13, 2022 · 63d4e02 · 63d4e02
1 parent cf1bfd0
commit 63d4e02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc
@@ -629,9 +629,6 @@ void PointStatVxOpt::clear() {
    mpr_sa.clear();
    mpr_ta.clear();
 
-   seeps_sa.clear();
-   seeps_ta.clear();
-
    mask_name.clear();
 
    eclv_points.clear();
@@ -805,18 +802,12 @@ void PointStatVxOpt::process_config(GrdFileType ftype,
    mpr_sa = odict.lookup_string_array(conf_key_mpr_column);
    mpr_ta = odict.lookup_thresh_array(conf_key_mpr_thresh);
 
-   // Conf: seeps_column and seeps_thresh
-   seeps_sa = odict.lookup_string_array(conf_key_seeps_column);
-   seeps_ta = odict.lookup_thresh_array(conf_key_seeps_thresh);
-
    // Dump the contents of the current thresholds
    if(mlog.verbosity_level() >= 5) {
       mlog << Debug(5)
            << "Parsed thresholds:\n"
            << "Matched pair filter columns:     " << write_css(mpr_sa) << "\n"
            << "Matched pair filter thresholds:  " << mpr_ta.get_str() << "\n"
-           << "SEEPS columns:     "               << write_css(seeps_sa) << "\n"
-           << "SEEPS thresholds:  "               << seeps_ta.get_str() << "\n"
            << "Forecast categorical thresholds: " << fcat_ta.get_str() << "\n"
            << "Observed categorical thresholds: " << ocat_ta.get_str() << "\n"
            << "Forecast continuous thresholds:  " << fcnt_ta.get_str() << "\n"
@@ -980,9 +971,6 @@ void PointStatVxOpt::set_vx_pd(PointStatConfInfo *conf_info) {
    // Store the MPR filter threshold
    vx_pd.set_mpr_thresh(mpr_sa, mpr_ta);
 
-   // Store the SEEPS threshold
-   vx_pd.set_seeps_thresh(seeps_sa, seeps_ta);
-
    // Store the climo CDF info
    vx_pd.set_climo_cdf_info_ptr(&cdf_info);
 
@@ -1293,6 +1281,12 @@ int PointStatVxOpt::n_txt_row(int i_txt_row) const {
 
          break;
 
+      case(i_seeps_mpr):
+         // Compute the number of matched pairs to be written
+         n = vx_pd.get_n_pair();
+
+         break;
+
       case(i_seeps):
          // Compute the number of matched pairs to be written
          n = vx_pd.get_n_pair();

diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h
@@ -51,9 +51,10 @@ static const int i_rps       = 16;
 static const int i_eclv      = 17;
 static const int i_mpr       = 18;
 static const int i_vcnt      = 19;
-static const int i_seeps     = 20;
+static const int i_seeps_mpr = 20;
+static const int i_seeps     = 21;
 
-static const int n_txt       = 21;
+static const int n_txt       = 22;
 
 // Text file type
 static const STATLineType txt_file_type[n_txt] = {
@@ -81,7 +82,8 @@ static const STATLineType txt_file_type[n_txt] = {
    stat_eclv,   //  17
    stat_mpr,    //  18
    stat_vcnt,   //  19
-   stat_seeps   //  20
+   stat_seeps_mpr,  //  20
+   stat_seeps   //  21
 
 };
 
@@ -130,9 +132,6 @@ class PointStatVxOpt {
       StringArray     mpr_sa;             // MPR column names
       ThreshArray     mpr_ta;             // MPR column thresholds
 
-      StringArray     seeps_sa;           // SEEPS column names
-      ThreshArray     seeps_ta;           // SEEPS column thresholds
-
       // Vector of MaskLatLon objects defining Lat/Lon Point masks
       vector<MaskLatLon> mask_llpnt;