From f6cf02c8931112a4782116a7cc981ba72f910d4c Mon Sep 17 00:00:00 2001
From: Joshua Watson <Joshua.Watson@noaa.gov>
Date: Fri, 6 Feb 2015 16:06:37 -0500
Subject: [PATCH] VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml,
 changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init;
 fixes #6363

Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848

Former-commit-id: 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff
---
 .../fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml       | 2 +-
 .../utility/edex_static/base/config/gfe/serverConfig.py       | 4 ++--
 .../utility/edex_static/base/smartinit/GFSLAMPGrid.py         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml
index 730632dce7..a28ae1b6b3 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/GFSLAMPGridded.xml
@@ -21,7 +21,7 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <contribute xsi:type="menuItem" menuText="Temperature" key="T"
         indentText="false" />
-    contribute xsi:type="menuItem" menuText="Temp Anl Uncertainty"
+    <contribute xsi:type="menuItem" menuText="Temp Anl Uncertainty"
         key="Terranl"  indentText="true" />
     <contribute xsi:type="menuItem" menuText="Dewpoint" key="DpT"
         indentText="true" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
index 774d429d85..2debb5cca5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
@@ -391,7 +391,7 @@ AstroTide = ("AstroTide", SCALAR, "ft", "Astro Tide", 20.0, -8.0, 1, NO)
 StormSurge = ("StormSurge", SCALAR, "ft", "Storm Surge", 30.0, -5.0, 1, NO)
 
 # Parm for Aviation/GFSLAMPGrid
-ClgHgt=("ClgHgt",SCALAR,"ft","Ceiling Height",25000.0,-100.0,0,NO)
+CigHgt=("CigHgt",SCALAR,"ft","Ceiling Height",25000.0,-100.0,0,NO)
 
 #---------------------------------------------------------------------------
 #
@@ -2055,7 +2055,7 @@ ENPwave_parms = [([WindWaveHeight, WaveHeight, SurfHeight, Wind], TC6),
             ([Swell, Swell2, Period, Period2], TC6)]
 
 # GFSLAMPGrid
-GFSLAMPGridPARMS=[([Temp, Td, Vis, ClgHgt],TC1)]
+GFSLAMPGridPARMS=[([Temp, Td, Vis, CigHgt],TC1)]
 
 #---------------------------------------------------------------------------
 # Databases for a site.
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py
index f5a1128746..82a0ba8351 100755
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/GFSLAMPGrid.py
@@ -12,7 +12,7 @@ class GFSLAMPForecaster(Forecaster):
     def __init__(self): 
         Forecaster.__init__(self, "GFSLAMP","GFSLAMP") 
 
-    def calcClgHgt(self, cc_CLG):
+    def calcCigHgt(self, cc_CLG):
         ceil = cc_CLG * 3.280839
         ceil = where(less(cc_CLG, 0), -99., ceil)
         return ceil