From 88803600df961ccf80ee946f6ac10257da08f167 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:28:37 -0700
Subject: [PATCH] renamed GEN_VX_MASK_OBS variables to be GEN_VX_MASK_INPUT as
 suggested by @JohnHalleyGotway in PR review

---
 docs/Users_Guide/glossary.rst           | 8 ++++----
 docs/Users_Guide/wrappers.rst           | 4 ++--
 metplus/wrappers/gen_vx_mask_wrapper.py | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/Users_Guide/glossary.rst b/docs/Users_Guide/glossary.rst
index 826eddf24..e370857fb 100644
--- a/docs/Users_Guide/glossary.rst
+++ b/docs/Users_Guide/glossary.rst
@@ -4364,7 +4364,7 @@ METplus Configuration Glossary
    GEN_VX_MASK_FILE_WINDOW_BEGIN
      Used to control the lower bound of the window around the valid time to determine if a GenVxMask input file should
      be used for processing. Applies to both the input file and the mask file(s).
-     Set :term:`GEN_VX_MASK_OBS_FILE_WINDOW_BEGIN` or
+     Set :term:`GEN_VX_MASK_INPUT_FILE_WINDOW_BEGIN` or
      :term:`GEN_VX_MASK_MASK_FILE_WINDOW_BEGIN` to set them separately.
      Overrides :term:`FILE_WINDOW_BEGIN`.
      See 'Use Windows to Find Valid Files' section for more information.
@@ -4374,14 +4374,14 @@ METplus Configuration Glossary
    GEN_VX_MASK_FILE_WINDOW_END
      Used to control the upper bound of the window around the valid time to determine if an GenVxMask input file should
      be used for processing. Applies to both the input file and the mask file(s).
-     Set :term:`GEN_VX_MASK_OBS_FILE_WINDOW_END` or
+     Set :term:`GEN_VX_MASK_INPUT_FILE_WINDOW_END` or
      :term:`GEN_VX_MASK_MASK_FILE_WINDOW_END` to set them separately.
      Overrides :term:`FILE_WINDOW_END`.
      See 'Use Windows to Find Valid Files' section for more information.
 
      | *Used by:* GenVxMask
 
-   GEN_VX_MASK_OBS_FILE_WINDOW_BEGIN
+   GEN_VX_MASK_INPUT_FILE_WINDOW_BEGIN
      Used to control the lower bound of the window around the valid time to determine if a GenVxMask input file should
      be used for processing. Applies to the input file only (not the mask file).
      Set :term:`GEN_VX_MASK_FILE_WINDOW_BEGIN` to control both input and mask.
@@ -4390,7 +4390,7 @@ METplus Configuration Glossary
 
      | *Used by:* GenVxMask
 
-   GEN_VX_MASK_OBS_FILE_WINDOW_END
+   GEN_VX_MASK_INPUT_FILE_WINDOW_END
      Used to control the upper bound of the window around the valid time to determine if a GenVxMask input file should
      be used for processing. Applies to the input file only (not the mask file).
      Set :term:`GEN_VX_MASK_FILE_WINDOW_END` to control both input and mask.
diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
index a42f6a67c..2218a9fe0 100644
--- a/docs/Users_Guide/wrappers.rst
+++ b/docs/Users_Guide/wrappers.rst
@@ -1749,8 +1749,8 @@ Configuration
 | :term:`GEN_VX_MASK_CUSTOM_LOOP_LIST`
 | :term:`GEN_VX_MASK_FILE_WINDOW_BEGIN`
 | :term:`GEN_VX_MASK_FILE_WINDOW_END`
-| :term:`GEN_VX_MASK_OBS_FILE_WINDOW_BEGIN`
-| :term:`GEN_VX_MASK_OBS_FILE_WINDOW_END`
+| :term:`GEN_VX_MASK_INPUT_FILE_WINDOW_BEGIN`
+| :term:`GEN_VX_MASK_INPUT_FILE_WINDOW_END`
 | :term:`GEN_VX_MASK_MASK_FILE_WINDOW_BEGIN`
 | :term:`GEN_VX_MASK_MASK_FILE_WINDOW_END`
 | :term:`GEN_VX_MASK_SKIP_VALID_TIMES`
diff --git a/metplus/wrappers/gen_vx_mask_wrapper.py b/metplus/wrappers/gen_vx_mask_wrapper.py
index 49ea397bd..2e0740805 100755
--- a/metplus/wrappers/gen_vx_mask_wrapper.py
+++ b/metplus/wrappers/gen_vx_mask_wrapper.py
@@ -42,7 +42,7 @@ def create_c_dict(self):
 
         # input and output files
         self.get_input_templates(c_dict, {
-            'OBS': {'prefix': 'GEN_VX_MASK', 'required': True},
+            'INPUT': {'prefix': 'GEN_VX_MASK', 'required': True},
         })
 
         c_dict['OUTPUT_DIR'] = self.config.getdir('GEN_VX_MASK_OUTPUT_DIR', '')
@@ -75,8 +75,8 @@ def create_c_dict(self):
                            "be equal to the number of items in GEN_VX_MASK_OPTIONS")
 
         # handle window variables [GEN_VX_MASK_]FILE_WINDOW_[BEGIN/END]
-        # or separately for input file (OBS) or mask file (MASK)
-        self.handle_file_window_variables(c_dict, data_types=['OBS', 'MASK'])
+        # or separately for input file (INPUT) or mask file (MASK)
+        self.handle_file_window_variables(c_dict, data_types=['INPUT', 'MASK'])
 
         return c_dict
 
@@ -185,7 +185,7 @@ def find_input_files(self, time_info, temp_file):
 
         # if temp file is not set, this is the first iteration, so read input file
         if not temp_file:
-            input_path = self.c_dict['ALL_FILES'][0].get('OBS', [''])[0]
+            input_path = self.c_dict['ALL_FILES'][0].get('INPUT', [''])[0]
 
             # return if file was not found
             if not input_path: