xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/Imager 13 micron (IR)/Imager 13 micron IR/g

Browse source
This commit is contained in:
mjames-upc 2017-12-08 11:36:23 -07:00
parent 7358f8f67e
commit 2095d83ee1
12 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml
View file

@ -22,7 +22,7 @@
<contribute xsi:type="separator" id="MySeparatorId"/> <contribute xsi:type="separator" id="MySeparatorId"/>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="IR Window" id="irWindow"> menuText="IR Window" id="irWindow">
<substitute key="element" value="Imager 13 micron (IR)"/> <substitute key="element" value="Imager 13 micron IR"/>
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/> <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml
View file

@ -44,7 +44,7 @@
</contribute> </contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml" <contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml"
menuText="13u" id="13u"> menuText="13u" id="13u">
<substitute key="element" value="Imager 13 micron (IR)"/> <substitute key="element" value="Imager 13 micron IR"/>
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/> <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute> </contribute>
<contribute xsi:type="satBundleItem" file="bundles/DerivedCONUSSatellite.xml" <contribute xsi:type="satBundleItem" file="bundles/DerivedCONUSSatellite.xml"

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/goesr/goesrConusWithLegacy.xml
View file

@ -33,7 +33,7 @@
</contribute> </contribute>
<contribute xsi:type="satBundleItem" file="bundles/satellite/goesr/goesrConusLegacyBlend.xml" <contribute xsi:type="satBundleItem" file="bundles/satellite/goesr/goesrConusLegacyBlend.xml"
menuText="13u" id="13u"> menuText="13u" id="13u">
<substitute key="element" value="CH-16-13.30um,Imager 13 micron (IR)"/> <substitute key="element" value="CH-16-13.30um,Imager 13 micron IR"/>
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/> <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
<substitute key="entity" value="GOES-16"/> <substitute key="entity" value="GOES-16"/>
</contribute> </contribute>

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml
View file

@ -36,7 +36,7 @@
</contribute> </contribute>
<contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml" <contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml"
menuText="13u" id="13u"> menuText="13u" id="13u">
<substitute key="element" value="Imager 13 micron (IR)"/> <substitute key="element" value="Imager 13 micron IR"/>
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/> <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
</contribute> </contribute>
<contribute xsi:type="placeholder" menuText="11-3.76u" id="11-3.76u" /> <contribute xsi:type="placeholder" menuText="11-3.76u" id="11-3.76u" />

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
View file

@ -135,7 +135,7 @@
<!-- PUERTO RICO REGIONAL --> <!-- PUERTO RICO REGIONAL -->
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Puerto Rico Regional 13 micron IR" id="irWindow"> menuText="Puerto Rico Regional 13 micron IR" id="irWindow">
<substitute key="element" value="Imager 13 micron (IR)"/> <substitute key="element" value="Imager 13 micron IR"/>
<substitute key="sector" value="Puerto Rico Regional"/> <substitute key="sector" value="Puerto Rico Regional"/>
<substitute key="entity" value="GOES-13(N)" /> <substitute key="entity" value="GOES-13(N)" />
<substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/> <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>

8
docs/python/satellite-imagery.md
View file

@ -51,7 +51,7 @@ Available sectors and products
- Imager Visible - Imager Visible
* East CONUS: * East CONUS:
- Imager 11 micron IR - Imager 11 micron IR
- Imager 13 micron (IR) - Imager 13 micron IR
- Imager 3.9 micron IR - Imager 3.9 micron IR
- Imager 6.7-6.5 micron IR (WV) - Imager 6.7-6.5 micron IR (WV)
- Imager Visible - Imager Visible
@ -104,7 +104,7 @@ Available sectors and products
- Sounder Visible imagery - Sounder Visible imagery
* Hawaii Regional: * Hawaii Regional:
- Imager 11 micron IR - Imager 11 micron IR
- Imager 13 micron (IR) - Imager 13 micron IR
- Imager 3.9 micron IR - Imager 3.9 micron IR
- Imager 6.7-6.5 micron IR (WV) - Imager 6.7-6.5 micron IR (WV)
- Imager Visible - Imager Visible
@ -136,7 +136,7 @@ Available sectors and products
- Sounder Based Derived Precipitable Water (PW) - Sounder Based Derived Precipitable Water (PW)
* Puerto Rico Regional: * Puerto Rico Regional:
- Imager 11 micron IR - Imager 11 micron IR
- Imager 13 micron (IR) - Imager 13 micron IR
- Imager 3.9 micron IR - Imager 3.9 micron IR
- Imager 6.7-6.5 micron IR (WV) - Imager 6.7-6.5 micron IR (WV)
- Imager Visible - Imager Visible
@ -153,7 +153,7 @@ Available sectors and products
- Sounder Based Derived Surface Skin Temp (SFC Skin) - Sounder Based Derived Surface Skin Temp (SFC Skin)
* West CONUS: * West CONUS:
- Imager 11 micron IR - Imager 11 micron IR
- Imager 13 micron (IR) - Imager 13 micron IR
- Imager 3.9 micron IR - Imager 3.9 micron IR
- Imager 6.7-6.5 micron IR (WV) - Imager 6.7-6.5 micron IR (WV)
- Imager Visible - Imager Visible

2
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java
View file

@ -101,7 +101,7 @@ public class D2DSatDatabase extends VGridDatabase {
* <pre> * <pre>
* "East CONUS/Imager Visible" * "East CONUS/Imager Visible"
* "East CONUS/Imager 11 micron IR" * "East CONUS/Imager 11 micron IR"
* "East CONUS/Imager 13 micron (IR)" * "East CONUS/Imager 13 micron IR"
* "East CONUS/Imager 3.9 micron IR" * "East CONUS/Imager 3.9 micron IR"
* </pre> * </pre>
* *

8
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/config/serverConfig.py
View file

@ -2685,7 +2685,7 @@ else: #######DCS3501 WEST_CONUS
# #
# "East CONUS/Imager Visible" # "East CONUS/Imager Visible"
# "East CONUS/Imager 11 micron IR" # "East CONUS/Imager 11 micron IR"
# "East CONUS/Imager 13 micron (IR)" # "East CONUS/Imager 13 micron IR"
# "East CONUS/Imager 3.9 micron IR" # "East CONUS/Imager 3.9 micron IR"
# #
@ -2701,7 +2701,7 @@ elif SID == "HFO":
elif SID == "SJU": elif SID == "SJU":
SATDATA = [("East CONUS/Imager Visible", "visibleEast"), SATDATA = [("East CONUS/Imager Visible", "visibleEast"),
("East CONUS/Imager 11 micron IR", "ir11East"), ("East CONUS/Imager 11 micron IR", "ir11East"),
("East CONUS/Imager 13 micron (IR)", "ir13East"), ("East CONUS/Imager 13 micron IR", "ir13East"),
("East CONUS/Imager 3.9 micron IR", "ir39East"), ("East CONUS/Imager 3.9 micron IR", "ir39East"),
("East CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporEast")] ("East CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporEast")]
@ -2713,12 +2713,12 @@ elif SID == "GUM":
else: else:
SATDATA = [("West CONUS/Imager Visible", "visibleWest"), SATDATA = [("West CONUS/Imager Visible", "visibleWest"),
("West CONUS/Imager 11 micron IR", "ir11West"), ("West CONUS/Imager 11 micron IR", "ir11West"),
("West CONUS/Imager 13 micron (IR)", "ir13West"), ("West CONUS/Imager 13 micron IR", "ir13West"),
("West CONUS/Imager 3.9 micron IR", "ir39West"), ("West CONUS/Imager 3.9 micron IR", "ir39West"),
("West CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporWest"), ("West CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporWest"),
("East CONUS/Imager Visible", "visibleEast"), ("East CONUS/Imager Visible", "visibleEast"),
("East CONUS/Imager 11 micron IR", "ir11East"), ("East CONUS/Imager 11 micron IR", "ir11East"),
("East CONUS/Imager 13 micron (IR)", "ir13East"), ("East CONUS/Imager 13 micron IR", "ir13East"),
("East CONUS/Imager 3.9 micron IR", "ir39East"), ("East CONUS/Imager 3.9 micron IR", "ir39East"),
("East CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporEast")] ("East CONUS/Imager 6.7-6.5 micron IR (WV)", "waterVaporEast")]

2
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
View file

@ -21,6 +21,6 @@
<DerivedParameter unit="GenericPixel" name="11u-13u Satellite" abbreviation="satDif11u13uIR" xmlns:ns2="group"> <DerivedParameter unit="GenericPixel" name="11u-13u Satellite" abbreviation="satDif11u13uIR" xmlns:ns2="group">
<Method name="satDifference"> <Method name="satDifference">
<Field abbreviation="Imager 11 micron IR" unit="IRPixel"/> <Field abbreviation="Imager 11 micron IR" unit="IRPixel"/>
<Field abbreviation="Imager 13 micron (IR)" unit="IRPixel"/> <Field abbreviation="Imager 13 micron IR" unit="IRPixel"/>
</Method> </Method>
</DerivedParameter> </DerivedParameter>

2
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
View file

@ -47,7 +47,7 @@
<paramLevelMatches> <paramLevelMatches>
<parameter>Imager 11 micron IR</parameter> <parameter>Imager 11 micron IR</parameter>
<parameter>Imager 12 micron IR</parameter> <parameter>Imager 12 micron IR</parameter>
<parameter>Imager 13 micron (IR)</parameter> <parameter>Imager 13 micron IR</parameter>
<parameter>Imager 13 micron IR</parameter> <parameter>Imager 13 micron IR</parameter>
</paramLevelMatches> </paramLevelMatches>
<imageStyle> <imageStyle>

2
edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/src/com/raytheon/uf/edex/plugin/satellite/gini/GiniSatelliteDecoder.java
View file

@ -520,7 +520,7 @@ public class GiniSatelliteDecoder {
*/ */
if ((mapProjection == SatSpatialFactory.PROJ_LAMBERT) if ((mapProjection == SatSpatialFactory.PROJ_LAMBERT)
&& (record.getPhysicalElement() && (record.getPhysicalElement()
.equalsIgnoreCase("Imager 13 micron (IR)")) .equalsIgnoreCase("Imager 13 micron IR"))
&& (record.getSectorID() && (record.getSectorID()
.equalsIgnoreCase("West CONUS"))) { .equalsIgnoreCase("West CONUS"))) {
nx = 1100; nx = 1100;

2
edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/satellite/gini/lookuptables/physicalElements.xml
View file

@ -24,7 +24,7 @@
<entry index="3" value="Imager 6.7-6.5 micron IR (WV)" /> <entry index="3" value="Imager 6.7-6.5 micron IR (WV)" />
<entry index="4" value="Imager 11 micron IR" /> <entry index="4" value="Imager 11 micron IR" />
<entry index="5" value="Imager 12 micron IR" /> <entry index="5" value="Imager 12 micron IR" />
<entry index="6" value="Imager 13 micron (IR)" /> <entry index="6" value="Imager 13 micron IR" />
<entry index="7" value="Imager 1.3 micron (IR)" /> <entry index="7" value="Imager 1.3 micron (IR)" />
<entry index="8" value="Reserved for future use" /> <entry index="8" value="Reserved for future use" />
<entry index="9" value="Reserved for future use" /> <entry index="9" value="Reserved for future use" />