Feature #1898 tc new options

docs/Users_Guide/glossary.rst

@@ -7569,22 +7569,22 @@ METplus Configuration Glossary
      | *Used by:* PB2NC
 
    TC_PAIRS_CONSENSUS<n>_NAME
-     Specify the value for nth 'consensus.name' in the MET configuration file for TCPairs.
+     Specify the value for the nth 'consensus.name' in the MET configuration file for TCPairs.
 
      | *Used by:* TCPairs
 
    TC_PAIRS_CONSENSUS<n>_MEMBERS
-     Specify the value for nth 'consensus.members' in the MET configuration file for TCPairs.
+     Specify the value for the nth 'consensus.members' in the MET configuration file for TCPairs.
 
      | *Used by:* TCPairs
 
    TC_PAIRS_CONSENSUS<n>_REQUIRED
-     Specify the value for nth 'consensus.required' in the MET configuration file for TCPairs.
+     Specify the value for the nth 'consensus.required' in the MET configuration file for TCPairs.
 
      | *Used by:* TCPairs
 
    TC_PAIRS_CONSENSUS<n>_MIN_REQ
-     Specify the value for nth 'consensus.min_req' in the MET configuration file for TCPairs.
+     Specify the value for the nth 'consensus.min_req' in the MET configuration file for TCPairs.
 
      | *Used by:* TCPairs
 
@@ -10093,3 +10093,113 @@ METplus Configuration Glossary
      See :term:`STAT_ANALYSIS_FCST_VALID_END`.
 
      | *Used by:* StatAnalysis
+
+   TC_PAIRS_DIAG_INFO_MAP<n>_DIAG_SOURCE
+     Specify the value for the nth 'diag_info_map.diag_source' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_INFO_MAP<n>_TRACK_SOURCE
+     Specify the value for the nth 'diag_info_map.track_source' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_INFO_MAP<n>_FIELD_SOURCE
+     Specify the value for the nth 'diag_info_map.field_source' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_INFO_MAP<n>_MATCH_TO_TRACK
+     Specify the value for the nth 'diag_info_map.match_to_track' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_INFO_MAP<n>_DIAG_NAME
+     Specify the value for the nth 'diag_info_map.diag_name' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_CONVERT_MAP<n>_DIAG_SOURCE
+     Specify the value for the nth 'diag_convert_map.diag_source' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_CONVERT_MAP<n>_KEY
+     Specify the value for the nth 'diag_convert_map.key' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_CONVERT_MAP<n>_CONVERT
+     Specify the value for the nth 'diag_convert_map.convert' in the MET configuration file for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_DIR<n>
+     Specify the (optional) directory for the nth -diag argument for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_TEMPLATE<n>
+     Specify the (optional) template for the nth -diag argument for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_PAIRS_DIAG_SOURCE<n>
+     Specify the (optional) source string for the nth -diag argument for TCPairs.
+
+     | *Used by:* TCPairs
+
+   TC_STAT_DIAG_THRESH_NAME
+     Specify the value for 'diag_thresh_name' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_DIAG_THRESH_VAL
+     Specify the value for 'diag_thresh_val' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_INIT_DIAG_THRESH_NAME
+     Specify the value for 'init_diag_thresh_name' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_INIT_DIAG_THRESH_VAL
+     Specify the value for 'init_diag_thresh_val' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_LINE_TYPE
+     Specify the value for 'line_type' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_EVENT_EQUAL
+     Specify the value for 'event_equal' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_EVENT_EQUAL_LEAD
+     Specify the value for 'event_equal_lead' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_OUT_INIT_MASK
+     Specify the value for 'out_init_mask' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   TC_STAT_OUT_VALID_MASK
+     Specify the value for 'out_valid_mask' in the MET configuration file for TCStat.
+
+     | *Used by:* TCStat
+
+   SERIES_ANALYSIS_MASK_GRID
+     Specify the value for 'mask.grid' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis
+
+   SERIES_ANALYSIS_MASK_POLY
+     Specify the value for 'mask.poly' in the MET configuration file for SeriesAnalysis.
+
+     | *Used by:* SeriesAnalysis

docs/Users_Guide/wrappers.rst

@@ -6387,6 +6387,8 @@ METplus Configuration
 | :term:`OBS_SERIES_ANALYSIS_CAT_THRESH`
 | :term:`FCST_SERIES_ANALYSIS_IS_PROB`
 | :term:`FCST_SERIES_ANALYSIS_PROB_IN_GRIB_PDS`
+| :term:`SERIES_ANALYSIS_MASK_GRID`
+| :term:`SERIES_ANALYSIS_MASK_POLY`
 |
 
 .. warning:: **DEPRECATED:**
@@ -6618,6 +6620,19 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`SERIES_ANALYSIS_CLIMO_CDF_DIRECT_PROB`
      - climo_cdf.direct_prob
 
+**${METPLUS_MASK_DICT}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`SERIES_ANALYSIS_MASK_GRID`
+     - mask.grid
+   * - :term:`SERIES_ANALYSIS_MASK_POLY`
+     - mask.poly
+
 **${METPLUS_BLOCK_SIZE}**
 
 .. list-table::
@@ -8210,6 +8225,17 @@ METplus Configuration
 | :term:`TC_PAIRS_CHECK_DUP`
 | :term:`TC_PAIRS_INTERP12`
 | :term:`TC_PAIRS_MATCH_POINTS`
+| :term:`TC_PAIRS_DIAG_INFO_MAP<n>_DIAG_SOURCE`
+| :term:`TC_PAIRS_DIAG_INFO_MAP<n>_TRACK_SOURCE`
+| :term:`TC_PAIRS_DIAG_INFO_MAP<n>_FIELD_SOURCE`
+| :term:`TC_PAIRS_DIAG_INFO_MAP<n>_MATCH_TO_TRACK`
+| :term:`TC_PAIRS_DIAG_INFO_MAP<n>_DIAG_NAME`
+| :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_DIAG_SOURCE`
+| :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_KEY`
+| :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_CONVERT`
+| :term:`TC_PAIRS_DIAG_SOURCE\<n\>`
+| :term:`TC_PAIRS_DIAG_TEMPLATE\<n\>`
+| :term:`TC_PAIRS_DIAG_DIR\<n\>`
 |
 
 .. warning:: **DEPRECATED:**
@@ -8492,6 +8518,41 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`TC_PAIRS_INTERP12`
      - interp12
 
+**${METPLUS_DIAG_INFO_MAP_LIST}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_PAIRS_DIAG_INFO_MAP<n>_DIAG_SOURCE`
+     - diag_info_map.diag_source
+   * - :term:`TC_PAIRS_DIAG_INFO_MAP<n>_TRACK_SOURCE`
+     - diag_info_map.track_source
+   * - :term:`TC_PAIRS_DIAG_INFO_MAP<n>_FIELD_SOURCE`
+     - diag_info_map.field_source
+   * - :term:`TC_PAIRS_DIAG_INFO_MAP<n>_MATCH_TO_TRACK`
+     - diag_info_map.match_to_track
+   * - :term:`TC_PAIRS_DIAG_INFO_MAP<n>_DIAG_NAME`
+     - diag_info_map.diag_name
+
+**${METPLUS_DIAG_CONVERT_MAP_LIST}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_DIAG_SOURCE`
+     - diag_convert_map.diag_source
+   * - :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_KEY`
+     - diag_convert_map.key
+   * - :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_CONVERT`
+     - diag_convert_map.convert
+
+
 .. _tcrmw_wrapper:
 
 TCRMW
@@ -8852,6 +8913,15 @@ METplus Configuration
 | :term:`TC_STAT_COLUMN_STR_EXC_VAL`
 | :term:`TC_STAT_INIT_STR_EXC_NAME`
 | :term:`TC_STAT_INIT_STR_EXC_VAL`
+| :term:`TC_STAT_DIAG_THRESH_NAME`
+| :term:`TC_STAT_DIAG_THRESH_VAL`
+| :term:`TC_STAT_INIT_DIAG_THRESH_NAME`
+| :term:`TC_STAT_INIT_DIAG_THRESH_VAL`
+| :term:`TC_STAT_LINE_TYPE`
+| :term:`TC_STAT_EVENT_EQUAL`
+| :term:`TC_STAT_EVENT_EQUAL_LEAD`
+| :term:`TC_STAT_OUT_INIT_MASK`
+| :term:`TC_STAT_OUT_VALID_MASK`
 |
 
 .. warning:: **DEPRECATED:**
@@ -9113,6 +9183,17 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`TC_STAT_VALID_MASK`
      - valid_mask
 
+**${METPLUS_LINE_TYPE}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_LINE_TYPE`
+     - line_type
+
 **${METPLUS_TRACK_WATCH_WARN}**
 
 .. list-table::
@@ -9256,6 +9337,50 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`TC_STAT_INIT_STR_EXC_VAL`
      - init_str_exc_val
 
+**${METPLUS_DIAG_THRESH_NAME}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_DIAG_THRESH_NAME`
+     - diag_thresh_name
+
+**${METPLUS_DIAG_THRESH_VAL}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_DIAG_THRESH_VAL`
+     - diag_thresh_val
+
+**${METPLUS_INIT_DIAG_THRESH_NAME}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_INIT_DIAG_THRESH_NAME`
+     - init_diag_thresh_name
+
+**${METPLUS_INIT_DIAG_THRESH_VAL}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_INIT_DIAG_THRESH_VAL`
+     - init_diag_thresh_val
+
 **${METPLUS_WATER_ONLY}**
 
 .. list-table::
@@ -9333,6 +9458,51 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`TC_STAT_MET_CONFIG_OVERRIDES`
      - n/a
 
+**${METPLUS_EVENT_EQUAL}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_EVENT_EQUAL`
+     - event_equal
+
+**${METPLUS_EVENT_EQUAL_LEAD}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_EVENT_EQUAL_LEAD`
+     - event_equal_lead
+
+**${METPLUS_OUT_INIT_MASK}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_OUT_INIT_MASK`
+     - out_init_mask
+
+**${METPLUS_OUT_VALID_MASK}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_OUT_VALID_MASK`
+     - out_valid_mask
+
+
 .. _user_script_wrapper:
 
 UserScript

internal/tests/pytests/wrappers/ascii2nc/test_ascii2nc_wrapper.py

@@ -186,11 +186,13 @@ def test_ascii2nc_wrapper(metplus_config, config_overrides,
     assert all_commands[0][0] == expected_cmd
 
     env_vars = all_commands[0][1]
+
+    missing_env = [item for item in env_var_values
+                   if item not in wrapper.WRAPPER_ENV_VAR_KEYS]
+    env_var_keys = wrapper.WRAPPER_ENV_VAR_KEYS + missing_env
+
     # check that environment variables were set properly
     # including deprecated env vars (not in wrapper env var keys)
-    env_var_keys = (wrapper.WRAPPER_ENV_VAR_KEYS +
-                    [name for name in env_var_values
-                     if name not in wrapper.WRAPPER_ENV_VAR_KEYS])
     for env_var_key in env_var_keys:
         match = next((item for item in env_vars if
                       item.startswith(env_var_key)), None)