Merge branch 'master_14.3.1' into asm_14.3.1

Former-commit-id: 2e170e3e328804a56f65de7cec0f0e89d3f1aba4

RadarServer/build.rcm/cfgbits/data/config/drop-ins/cronOTRs.xml

@@ -22,7 +22,7 @@
   <cronOTR cron="0 23,53 * * * ?"     productCode="74"  wmo="SDUS4" nnn="RCM"/>
   <cronOTR cron="0 15 * * * ?"        productCode="79"  wmo="SDUS6" nnn="N3P" radarTypes="WSR"/>
   <cronOTR cron="0 16 * * * ?"        productCode="136" randomWait="240"/>
-  <cronOTR cron="0 5 0,8,16 * * ?"    productCode="152" randomWait="600" radarTypes="WSR"/>
+  <cronOTR cron="0 5 0,8,16 * * ?"    productCode="152" randomWait="600"/>
   <cronOTR cron="0 1 0,6,12,18 * * ?">
     <request> <productCode>34</productCode> <pdw20>2</pdw20> </request>
     <request> <productCode>34</productCode> <pdw20>4</pdw20> </request>

RadarServer/build.rcm/cfgbits/data/config/drop-ins/rps-RPGOP-tcp.storm

@@ -1,10 +1,12 @@
-RPS List rps-RPGOP-tcp.VCP11.rps created    2010:11:18:17:28:33 ... 46 products
+RPS List rps-RPGOP-tcp.VCP11.rps created    2014:02:18:17:28:33 ... 48 products
  An RPS list contains the fields: Prod-Name, Mnemonic, Prod-Code
  Number of Data Levels, Resolution, Layer Code, Elevation, Contour Interval,
  Priority, Req Interval, Map, Lower Layer, Upper Layer, multCut, endHour, timeSpan
  The record format is: '%-39s  %-3s%4d%4d%6d %c%6d%7d%2d%2d%c%3d%3d %c%7d%7d'
 Reflectivity (Z)                         Z    94 256   100 -  8226     -1 0 1N -1 -1 N     -1      0
+Reflectivity (Z)                         Z    94 256   100 -     5     -1 0 1N -1 -1 Y     -1      0
 Velocity (V)                             V    99 256    25 -  8226     -1 0 1N -1 -1 N     -1      0
+Velocity (V)                             V    99 256    25 -     5     -1 0 1N -1 -1 Y     -1      0
 Reflectivity (Z)                         Z    19  16   100 -     5     -1 0 1N -1 -1 N     -1      0
 Reflectivity (Z)                         Z    20  16   200 -     5     -1 0 1N -1 -1 N     -1      0
 Velocity (V)                             V    27  16   100 -     5     -1 0 1N -1 -1 N     -1      0

cave/build/p2-build.xml

@@ -323,10 +323,6 @@
              <param name="feature"
                   value="com.raytheon.uf.viz.gisdatastore.feature" />
         </antcall>
-		<antcall target="p2.build.repo">
-		     <param name="feature"
-			  value="com.raytheon.viz.dataaccess.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 		     <param name="feature"
 			  value="com.raytheon.uf.viz.d2d.ui.awips.feature" />

cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

@@ -76,6 +76,7 @@ import com.raytheon.uf.viz.d2d.core.D2DLoadProperties;
  * Feb 10, 2009            chammack    Initial creation
  * Jul 03, 2013 2159       bsteffen    Synchronize TimeCache access.
  * Aug  9, 2013 DR 16448   D. Friedman Validate time match basis in redoTimeMatching
+ * May  5, 2014 DR 17201   D. Friedman Make same-radar time matching work more like A1.
  * 
  * </pre>
  * 
@@ -133,7 +134,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
     protected transient AbstractVizResource<?, ?> timeMatchBasis;
 
-    private IDisposeListener timeMatchBasisDisposeListener = new IDisposeListener() {
+    private final IDisposeListener timeMatchBasisDisposeListener = new IDisposeListener() {
 
         @Override
         public void disposed(AbstractVizResource<?, ?> resource) {
@@ -168,7 +169,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
     private AbstractTimeMatchingConfigurationFactory configFactory;
 
-    private Map<AbstractVizResource<?, ?>, TimeCache> timeCacheMap = new IdentityHashMap<AbstractVizResource<?, ?>, D2DTimeMatcher.TimeCache>();
+    private final Map<AbstractVizResource<?, ?>, TimeCache> timeCacheMap = new IdentityHashMap<AbstractVizResource<?, ?>, D2DTimeMatcher.TimeCache>();
 
     /**
      * Default Constructor.
@@ -184,6 +185,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         }
     }
 
+    @Override
     public void redoTimeMatching(AbstractVizResource<?, ?> resource) {
         TimeCache cache = null;
         synchronized (timeCacheMap) {
@@ -230,8 +232,9 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     @Override
     public void redoTimeMatching(IDescriptor descriptor) throws VizException {
         synchronized (this) {
-            if (timeMatchBasis != null && timeMatchBasis.getDescriptor() == descriptor &&
+            if ((timeMatchBasis != null)
-                    ! validateTimeMatchBasis(descriptor)) {
+                    && (timeMatchBasis.getDescriptor() == descriptor)
+                    && !validateTimeMatchBasis(descriptor)) {
                 changeTimeMatchBasis(null);
             }
             if (timeMatchBasis != null) {
@@ -265,7 +268,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                 AbstractVizResource<?, ?> rsc = pairIterator.next()
                         .getResource();
                 recursiveOverlay(descriptor, new FramesInfo(timeSteps, -1,
-                        resourceTimeMap), rsc);
+                        resourceTimeMap), rsc, resourceTimeMap);
             }
 
             // Update the descriptor to the new times.
@@ -287,7 +290,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             int oldIndex, DataTime[] frames, int startFrame) {
         int frameToUse = startFrame;
         IRenderableDisplay display = descriptor.getRenderableDisplay();
-        if (display != null && display.getContainer() != null) {
+        if ((display != null) && (display.getContainer() != null)) {
             IDisplayPaneContainer container = display.getContainer();
             if (container.getLoopProperties().isLooping()) {
                 return frameToUse;
@@ -295,7 +298,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         }
         switch (descriptor.getFrameCoordinator().getAnimationMode()) {
         case Latest: {
-            if (oldIndex == oldTimes.length - 1) {
+            if (oldIndex == (oldTimes.length - 1)) {
                 frameToUse = frames.length - 1;
             }
             break;
@@ -337,22 +340,23 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      */
     private int determineNewIndex(IDescriptor descriptor, FramesInfo currInfo,
             DataTime[] timeSteps) {
-        if (timeSteps == null || timeSteps.length == 0) {
+        if ((timeSteps == null) || (timeSteps.length == 0)) {
             return -1;
         }
         // If possible just copy from the time match basis
-        if (timeMatchBasis.getDescriptor() != null
+        if ((timeMatchBasis.getDescriptor() != null)
-                && timeMatchBasis.getDescriptor() != descriptor) {
+                && (timeMatchBasis.getDescriptor() != descriptor)) {
             int idx = timeMatchBasis.getDescriptor().getFramesInfo()
                     .getFrameIndex();
-            if (idx >= 0 && idx < timeSteps.length) {
+            if ((idx >= 0) && (idx < timeSteps.length)) {
                 return idx;
             }
         }
         // Next try to get the closest time to
         DataTime[] origSteps = currInfo.getFrameTimes();
         int curIndex = currInfo.getFrameIndex();
-        if (origSteps != null && curIndex >= 0 && curIndex < origSteps.length) {
+        if ((origSteps != null) && (curIndex >= 0)
+                && (curIndex < origSteps.length)) {
             DataTime startTime = origSteps[curIndex];
             int dateIndex = Arrays.binarySearch(timeSteps, startTime);
             if (dateIndex < 0) {
@@ -362,7 +366,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             } else {
                 dateIndex = indexToUpdateTo(descriptor, origSteps, curIndex,
                         timeSteps, dateIndex);
-                if (dateIndex >= 0 && dateIndex < timeSteps.length - 1) {
+                if ((dateIndex >= 0) && (dateIndex < (timeSteps.length - 1))) {
                     return dateIndex;
                 }
             }
@@ -379,20 +383,24 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      *            the descriptor that is being updated
      * @param rsc
      *            the resource being updated.
-     * @param resourceTimeMap
+     * @param frameTimesSoure
-     *            map of all previously time matched resources.
+     *            map of all previously time matched resources that may be used
+     *            to determine the frame times
      * @throws VizException
      */
     private void recursiveOverlay(IDescriptor descriptor,
-            FramesInfo framesInfo, AbstractVizResource<?, ?> rsc)
+            FramesInfo framesInfo, AbstractVizResource<?, ?> rsc,
+            Map<AbstractVizResource<?, ?>, DataTime[]> frameTimesSoure)
             throws VizException {
         if (rsc == null) {
             return;
         }
         if (rsc instanceof IResourceGroup) {
+            Map<AbstractVizResource<?, ?>, DataTime[]> completed = new HashMap<AbstractVizResource<?, ?>, DataTime[]>(
+                    frameTimesSoure);
             for (ResourcePair rp : ((IResourceGroup) rsc).getResourceList()) {
                 AbstractVizResource<?, ?> rsc1 = rp.getResource();
-                recursiveOverlay(descriptor, framesInfo, rsc1);
+                recursiveOverlay(descriptor, framesInfo, rsc1, completed);
             }
         }
 
@@ -401,18 +409,24 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                     .getLoadProperties());
             TimeCache timeCache = getTimeCache(rsc);
             synchronized (timeCache) {
-                DataTime[] timeSteps = getFrameTimes(descriptor, framesInfo);
+                DataTime[] timeSteps = getFrameTimes(descriptor, framesInfo,
+                        frameTimesSoure);
                 if (Arrays.equals(timeSteps, timeCache.getLastBaseTimes())) {
                     framesInfo.getTimeMap().put(rsc,
                             timeCache.getLastFrameTimes());
                 } else {
                     config = config.clone();
-                    if (config.getDataTimes() == null
+                    if ((config.getDataTimes() == null)
-                            || config.getDataTimes().length < 1) {
+                            || (config.getDataTimes().length < 1)) {
                         config.setDataTimes(getLatestTimes(rsc));
                     }
                     populateConfiguration(config);
-                    DataTime[] overlayDates = TimeMatcher.makeOverlayList(
+                    TimeMatcher tm = new TimeMatcher();
+                    if (rsc instanceof ID2DTimeMatchingExtension) {
+                        ((ID2DTimeMatchingExtension) rsc).modifyTimeMatching(
+                                this, rsc, tm);
+                    }
+                    DataTime[] overlayDates = tm.makeOverlayList(
                             config.getDataTimes(), config.getClock(),
                             timeSteps, config.getLoadMode(),
                             config.getForecast(), config.getDelta(),
@@ -429,15 +443,16 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      * is the timeMatchBasisTimes, for four panel it is a bit more complex.
      * 
      * @param descriptor
-     * @param rsc
+     * @param frameInfo
-     * @param resourceTimeMap
+     * @param frameTimesSoure
      * @return
      */
     private DataTime[] getFrameTimes(IDescriptor descriptor,
-            FramesInfo frameInfo) {
+            FramesInfo frameInfo,
+            Map<AbstractVizResource<?, ?>, DataTime[]> frameTimesSource) {
         DataTime[] descTimes = frameInfo.getFrameTimes();
-        if (timeMatchBasis != null
+        if ((timeMatchBasis != null)
-                && timeMatchBasis.getDescriptor() == descriptor) {
+                && (timeMatchBasis.getDescriptor() == descriptor)) {
             return descTimes;
         }
 
@@ -448,17 +463,17 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         DataTime[] times = new DataTime[frameInfo.getFrameCount()];
 
         for (ResourcePair rp : descriptor.getResourceList()) {
-            DataTime[] rscTimes = frameInfo.getTimeMap().get(rp.getResource());
+            DataTime[] rscTimes = frameTimesSource.get(rp.getResource());
-            if (rscTimes == null || rscTimes.length != times.length) {
+            if ((rscTimes == null) || (rscTimes.length != times.length)) {
                 if (rp.getResource() instanceof IResourceGroup) {
                     // Descend into resource groups.
                     for (ResourcePair rp1 : ((IResourceGroup) rp.getResource())
                             .getResourceList()) {
-                        rscTimes = frameInfo.getTimeMap()
+                        rscTimes = frameTimesSource.get(rp1.getResource());
-                                .get(rp1.getResource());
+                        if ((rscTimes != null)
-                        if (rscTimes != null && rscTimes.length == times.length) {
+                                && (rscTimes.length == times.length)) {
                             for (int i = 0; i < times.length; i++) {
-                                if (times[i] == null && rscTimes[i] != null) {
+                                if ((times[i] == null) && (rscTimes[i] != null)) {
                                     times[i] = rscTimes[i];
                                 }
                             }
@@ -468,13 +483,13 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                 continue;
             }
             for (int i = 0; i < times.length; i++) {
-                if (times[i] == null && rscTimes[i] != null) {
+                if ((times[i] == null) && (rscTimes[i] != null)) {
                     times[i] = rscTimes[i];
                 }
             }
         }
         for (int i = 0; i < times.length; i++) {
-            if (times[i] == null && descTimes[i] != null) {
+            if ((times[i] == null) && (descTimes[i] != null)) {
                 times[i] = descTimes[i];
             }
         }
@@ -498,8 +513,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             DataTime[] times = null;
             synchronized (timeCache) {
                 times = timeCache.getLastFrameTimes();
-                if (times == null || timeCache.getLastBaseTimes() != null
+                if ((times == null) || (timeCache.getLastBaseTimes() != null)
-                        || timeCache.getLastFrameCount() != numberOfFrames) {
+                        || (timeCache.getLastFrameCount() != numberOfFrames)) {
                     times = makeEmptyLoadList(numberOfFrames, timeMatchBasis);
                     timeCache.setTimes(null, times, numberOfFrames);
                 }
@@ -556,17 +571,18 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      */
     private DataTime[] makeEmptyLoadList(int numberOfFrames,
             AbstractVizResource<?, ?> rsc) throws VizException {
-        if (timeMatchBasis != null && rsc != timeMatchBasis) {
+        if ((timeMatchBasis != null) && (rsc != timeMatchBasis)) {
             throw new IllegalArgumentException(
                     "Cannot make Empty Load List for a resource which is not the Time Match Basis.");
         }
 
         TimeMatchingConfiguration config = getConfiguration(
                 rsc.getLoadProperties()).clone();
-        if (config.getDataTimes() == null || config.getDataTimes().length < 1) {
+        if ((config.getDataTimes() == null)
+                || (config.getDataTimes().length < 1)) {
             config.setDataTimes(getLatestTimes(rsc));
-            if (config.getDataTimes() == null
+            if ((config.getDataTimes() == null)
-                    || config.getDataTimes().length < 1) {
+                    || (config.getDataTimes().length < 1)) {
                 return null;
             }
         }
@@ -574,7 +590,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         DataTime[] timeSteps = TimeMatcher.makeEmptyLoadList(
                 config.getDataTimes(), config.getClock(), numberOfFrames,
                 config.getLoadMode(), config.getForecast(), config.getDelta());
-        if (timeSteps == null || timeSteps.length == 0) {
+        if ((timeSteps == null) || (timeSteps.length == 0)) {
             return null;
         }
         changeTimeMatchBasis(rsc);
@@ -656,8 +672,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         Arrays.sort(config.getDataTimes());
         if (config.getClock() == null) {
             if (SimulatedTime.getSystemTime().isRealTime()
-                    && config.getDataTimes() != null
+                    && (config.getDataTimes() != null)
-                    && config.getDataTimes().length != 0) {
+                    && (config.getDataTimes().length != 0)) {
                 config.setClock(config.getDataTimes()[config.getDataTimes().length - 1]
                         .getValidTime().getTime());
             } else {
@@ -834,12 +850,12 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         if (timeMatchBasis == null) {
             config = configFactory.getConfiguration(loadProps, this,
                     availableTimes, descriptor);
-            if (config == null || config.isCancel()) {
+            if ((config == null) || config.isCancel()) {
                 return dataTimesToLoad;
             }
             config = config.clone();
-            if (config.getDataTimes() == null
+            if ((config.getDataTimes() == null)
-                    || config.getDataTimes().length < 1) {
+                    || (config.getDataTimes().length < 1)) {
                 config.setDataTimes(availableTimes);
             }
             populateConfiguration(config);
@@ -850,26 +866,27 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         } else {
             config = configFactory.getOverlayConfiguration(loadProps, this,
                     availableTimes, descriptor);
-            if (config == null || config.isCancel()) {
+            if ((config == null) || config.isCancel()) {
                 return dataTimesToLoad;
             }
             config = config.clone();
-            if (config.getDataTimes() == null
+            if ((config.getDataTimes() == null)
-                    || config.getDataTimes().length < 1) {
+                    || (config.getDataTimes().length < 1)) {
                 config.setDataTimes(availableTimes);
             }
             populateConfiguration(config);
             DataTime[] existingDataTimes = getFrameTimes(descriptor,
-                    descriptor.getFramesInfo());
+                    descriptor.getFramesInfo(), descriptor.getFramesInfo()
+                            .getTimeMap());
 
-            dataTimesToLoad = TimeMatcher.makeOverlayList(
+            TimeMatcher tm = new TimeMatcher();
-                    config.getDataTimes(), config.getClock(),
+            dataTimesToLoad = tm.makeOverlayList(config.getDataTimes(),
-                    existingDataTimes, config.getLoadMode(),
+                    config.getClock(), existingDataTimes, config.getLoadMode(),
                     config.getForecast(), config.getDelta(),
                     config.getTolerance());
 
-            if (timeMatchBasis.getDescriptor() != null
+            if ((timeMatchBasis.getDescriptor() != null)
-                    && timeMatchBasis.getDescriptor() != descriptor) {
+                    && (timeMatchBasis.getDescriptor() != descriptor)) {
                 // Still use my times, but the index from the time match basis
                 FramesInfo myFi = descriptor.getFramesInfo();
                 FramesInfo tmFi = timeMatchBasis.getDescriptor()
@@ -1052,11 +1069,12 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         resetMultiload();
     }
 
+    @Override
     public void resetMultiload() {
         configFactory.resetMultiload();
     }
 
-    private boolean validateTimeMatchBasis(IDescriptor descriptor ) {
+    private boolean validateTimeMatchBasis(IDescriptor descriptor) {
         /*
          * If a resource is shared by multiple panels (this can be the case with
          * tools, at least), then it is necessary to search all of them as
@@ -1064,14 +1082,14 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
          * this condition to occur?
          */
         IRenderableDisplay display = descriptor.getRenderableDisplay();
-        IDisplayPaneContainer container = display != null ?
+        IDisplayPaneContainer container = display != null ? display
-                display.getContainer() : null;
+                .getContainer() : null;
         if (container != null) {
             for (IDisplayPane pane : container.getDisplayPanes()) {
                 IRenderableDisplay paneDisplay = pane.getRenderableDisplay();
-                IDescriptor paneDescriptor = paneDisplay != null ?
+                IDescriptor paneDescriptor = paneDisplay != null ? paneDisplay
-                        paneDisplay.getDescriptor() : null;
+                        .getDescriptor() : null;
-                if (paneDescriptor != null
+                if ((paneDescriptor != null)
                         && validateTimeMatchBasis(paneDescriptor
                                 .getResourceList())) {
                     return true;
@@ -1091,10 +1109,10 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             } else if (rp.getProperties().isMapLayer()
                     || rp.getProperties().isSystemResource()) {
                 continue;
-            } else if (rsc != null
+            } else if ((rsc != null)
-                    && rsc.getResourceData() instanceof IResourceGroup) {
+                    && (rsc.getResourceData() instanceof IResourceGroup)) {
-                if (validateTimeMatchBasis(((IResourceGroup) rsc.getResourceData())
+                if (validateTimeMatchBasis(((IResourceGroup) rsc
-                        .getResourceList())) {
+                        .getResourceData()).getResourceList())) {
                     return true;
                 }
             }

cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/ID2DTimeMatchingExtension.java

@@ -0,0 +1,20 @@
+package com.raytheon.uf.viz.d2d.core.time;
+
+import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
+
+/**
+ * Allows a resource to modify time matching behavior
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * 2014-05-05   DR 17201   D. Friedman Initial revision.
+ * 
+ * </pre>
+ * 
+ */
+public interface ID2DTimeMatchingExtension {
+    public void modifyTimeMatching(D2DTimeMatcher d2dTimeMatcher, AbstractVizResource<?, ?> rsc, TimeMatcher timeMatcher);
+}

cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java

@@ -51,6 +51,7 @@ import com.raytheon.uf.common.time.DataTimeComparator;
  * Jun 19, 2007            chammack    Initial Creation.
  * May 31, 2013 15908      dhuffman    Removed a null from a method call to
  *                                     cease a null pointer exception.
+ * May  5, 2014 DR 17201   D. Friedman Make same-radar time matching work more like A1.
  * Aug 08, 2013 2245       bsteffen    Make all DataTime comparisons consistent.
  * 
  * </pre>
@@ -97,15 +98,15 @@ public class TimeMatcher {
     // 6 hours in seconds
     private static final long SIX_HOURS_S = ONE_HOUR_S * 6;
 
-    private static boolean radarOnRadarYes = false;
-
     public static final float DEFAULT_TOLERANCE_FACTOR = 0.6f;
 
     private static long autoIntervals[] = { 300, 900, 1800, 3600, 10800, 21600,
             43200, 86400 };
 
-    // Disable instantiation
+    private boolean radarOnRadarYes = false;
-    private TimeMatcher() {
+
+    // Package access
+    TimeMatcher() {
 
     }
 
@@ -223,7 +224,7 @@ public class TimeMatcher {
     // of time separating the individual items. Considers separation in both
     // initial time and forecast time space. Separation cannot be zero.
     // ---------------------------------------------------------------------------
-    static IntrinsicReturnVal intrinsicPeriod(DataTime[] times,
+    IntrinsicReturnVal intrinsicPeriod(DataTime[] times,
             boolean haveForecasts) {
         int i0, i, j, m, nn, n0;
         long dt, dt2, d, df;
@@ -364,7 +365,7 @@ public class TimeMatcher {
     // call to validTimeSort and determines the minimum length of valid
     // time separating the individual items. Separation cannot be zero.
     // ---------------------------------------------------------------------------
-    static IntrinsicReturnVal intrinsicPeriod(List<DataTime> times,
+    IntrinsicReturnVal intrinsicPeriod(List<DataTime> times,
             List<Integer> majorIndex, boolean haveForecasts) {
         int i, j, k, nn, n0;
         long dt, dt2, d;
@@ -540,7 +541,7 @@ public class TimeMatcher {
     // tolerance being half the intrinsic period the existing frames or the
     // data being overlaid, whichever is greater.
     // ---------------------------------------------------------------------------
-    public static DataTime[] doValTimOverlay(DataTime[] depictTimeArr,
+    public DataTime[] doValTimOverlay(DataTime[] depictTimeArr,
             DataTime[] frameTimes, long deltaTime, LoadMode mode, Date latest,
             float tolerance) {
 
@@ -656,10 +657,31 @@ public class TimeMatcher {
 
         if (fspatial) {
             frameFcsts = dataFcsts;
+            dtf = dt;
         } else if (dtf > dt) {
             dt = dtf;
         }
 
+        // A1 TimeMatchFunctions.C ~ line 952
+        if (dt > ONE_MINUTE_MS && dt <= ELEVEN_MINUTES_MS
+                && dtf > ONE_MINUTE_MS && dtf <= ELEVEN_MINUTES_MS
+                && radarOnRadarYes) {
+            if (dtf<dt) {
+                dt = dtf;
+            }
+        } else if (dtf>dt) {
+            dt = dtf;
+        }
+
+        /* A1 TimeMatchingFunctions.C ~ line 960
+         *  For 88D radar, dt is usually 300 seconds or larger
+         *  For TDWR radar, dt is usually 180 seconds or less
+         *  To allow 3 minutes overlay for TDWR products, dt is set to 300 seconds
+         */
+        if (radarOnRadarYes && dt < FIVE_MINUTES_MS) {
+            dt = FIVE_MINUTES_MS;
+        }
+
         if (tolerance > 99) {
             dt = 0x7FFFFFl * 1000l;
         } else {
@@ -697,7 +719,7 @@ public class TimeMatcher {
             vf = (frameTimes)[f].getMatchValid() + deltaTime;
             v1 = vf - dt; // first usable valid time
             v2 = vf + dt; // last usable valid time
-            if (!dataFcsts && !frameFcsts && vf > latest.getTime()) {
+            if (!radarOnRadarYes && !dataFcsts && !frameFcsts && vf > latest.getTime()) {
                 // if we are dealing with live data(without forecast times) then
                 // we want to allow extra time on the latest frame. For example
                 // LAPS data arrives hourly, and radar arrives every 6 minutes,
@@ -1411,7 +1433,7 @@ public class TimeMatcher {
     // Optional argument "forecast" controls how modes PROG_LOOP,
     // FORCED, FCST_TIME_MATCH and DPROG_DT work.
     // ---------------------------------------------------------------------------
-    public static DataTime[] makeOverlayList(DataTime[] depictTimes,
+    public DataTime[] makeOverlayList(DataTime[] depictTimes,
             Date clock, DataTime[] frameTimes, LoadMode mode, long forecast,
             long deltaTime, float tolerance) {
         // The levelvalue check has been added to allow resources on a single
@@ -1554,7 +1576,7 @@ public class TimeMatcher {
         default:
             break;
         }
-        radarOnRadarYes = false;
+        // radarOnRadarYes = false; // A2 uses setRadarOnRadar().
         // If we stripped the levelvalue, restore it.
         if (levelvalue != null) {
             for (DataTime time : loadTimes) {
@@ -1594,7 +1616,7 @@ public class TimeMatcher {
             Arrays.sort(times);
         }
 
-        long minInterval = intrinsicPeriod(times, haveForecasts).intrinsicPeriod;
+        long minInterval = (new TimeMatcher()).intrinsicPeriod(times, haveForecasts).intrinsicPeriod;
         // the intrinsic period interval is in milliseconds
         minInterval /= 1000;
 
@@ -1667,4 +1689,11 @@ public class TimeMatcher {
         return intervals;
     }
 
+    public boolean isRadarOnRadar() {
+        return radarOnRadarYes;
+    }
+
+    public void setRadarOnRadar(boolean radarOnRadar) {
+        this.radarOnRadarYes = radarOnRadar;
+    }
 }

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge0ftCumul_PHISH" name="PHISH probability &gt; 0 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge0ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge10ftCumul_PHISH" name="PHISH probability &gt; 10 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge10ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge10ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 10 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge10ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge10ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge10ftIncr_PHISH" name="PHISH probability &gt; 10 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge10ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge11ftCumul_PHISH" name="PHISH probability &gt; 11 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge11ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge11ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 11 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge11ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge11ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge11ftIncr_PHISH" name="PHISH probability &gt; 11 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge11ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge12ftCumul_PHISH" name="PHISH probability &gt; 12 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge12ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge12ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 12 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge12ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge12ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge12ftIncr_PHISH" name="PHISH probability &gt; 12 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge12ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge13ftCumul_PHISH" name="PHISH probability &gt; 13 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge13ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge13ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 13 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge13ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge13ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge13ftIncr_PHISH" name="PHISH probability &gt; 13 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge13ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge14ftCumul_PHISH" name="PHISH probability &gt; 14 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge14ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge14ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 14 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge14ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge14ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge14ftIncr_PHISH" name="PHISH probability &gt; 14 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge14ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge15ftCumul_PHISH" name="PHISH probability &gt; 15 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge15ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge15ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 15 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge15ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge15ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge15ftIncr_PHISH" name="PHISH probability &gt; 15 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge15ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge16ftCumul_PHISH" name="PHISH probability &gt; 16 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge16ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge16ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 16 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge16ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge16ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge16ftIncr_PHISH" name="PHISH probability &gt; 16 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge16ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge17ftCumul_PHISH" name="PHISH probability &gt; 17 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge17ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge17ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 17 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge17ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge17ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge17ftIncr_PHISH" name="PHISH probability &gt; 17 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge17ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge18ftCumul_PHISH" name="PHISH probability &gt; 18 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge18ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge18ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 18 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge18ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge18ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge18ftIncr_PHISH" name="PHISH probability &gt; 18 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge18ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge19ftCumul_PHISH" name="PHISH probability &gt; 19 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge19ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge19ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 19 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge19ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge19ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge19ftIncr_PHISH" name="PHISH probability &gt; 19 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge19ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge1ftCumul_PHISH" name="PHISH probability &gt; 1 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge1ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge20ftCumul_PHISH" name="PHISH probability &gt; 20 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge20ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge20ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 20 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge20ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge20ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge20ftIncr_PHISH" name="PHISH probability &gt; 20 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge20ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge21ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge21ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 21 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge21ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge22ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge22ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 22 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge22ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge23ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge23ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 23 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge23ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge24ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge24ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 24 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge24ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge25ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge25ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 25 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge25ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge2ftCumul_PHISH" name="PHISH probability &gt; 2 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge2ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge2ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 2 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge2ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge3ftCumul_PHISH" name="PHISH probability &gt; 3 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge3ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge3ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 3 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge3ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge4ftCumul_PHISH" name="PHISH probability &gt; 4 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge4ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge4ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 4 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge4ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml

@@ -18,8 +18,9 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter abbreviation="TPCSG-549E2" name="Probabilistic Storm Surge probability &gt; 18 feet" unit="%">
+<DerivedParameter abbreviation="PSurge4ftIncr_PHISH" name="PHISH probability &gt; 4 feet - incremental [agl]" unit="%">
-    <Method models="TPCSurgeProb" name="Alias">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
-        <Field abbreviation="PSurge18ftRun"/>
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge4ft6hr"/>
     </Method>
 </DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge5ftCumul_PHISH" name="PHISH probability &gt; 5 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge5ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge5ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 5 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge5ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml

@@ -18,8 +18,9 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter abbreviation="TPCSG-579E2" name="Probabilistic Storm Surge probability &gt; 19 feet" unit="%">
+<DerivedParameter abbreviation="PSurge5ftIncr_PHISH" name="PHISH probability &gt; 5 feet - incremental [agl]" unit="%">
-    <Method models="TPCSurgeProb" name="Alias">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
-        <Field abbreviation="PSurge19ftRun"/>
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge5ft6hr"/>
     </Method>
 </DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge6ftCumul_PHISH" name="PHISH probability &gt; 6 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge6ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge6ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 6 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge6ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml

@@ -18,8 +18,9 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter abbreviation="TPCSG" name="Probabilistic Storm Surge height w/10% chance of being exceeded" unit="ft">
+<DerivedParameter abbreviation="PSurge6ftIncr_PHISH" name="PHISH probability &gt; 6 feet - incremental [agl]" unit="%">
-    <Method models="TPCSurgeProb" name="Alias">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
-        <Field abbreviation="Surge10pctRun"/>
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge6ft6hr"/>
     </Method>
 </DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge7ftCumul_PHISH" name="PHISH probability &gt; 7 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge7ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge7ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 7 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge7ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml

@@ -18,8 +18,9 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<DerivedParameter abbreviation="TPCSG-518E2" name="Probabilistic Storm Surge probability &gt; 17 feet" unit="%">
+<DerivedParameter abbreviation="PSurge7ftIncr_PHISH" name="PHISH probability &gt; 7 feet - incremental [agl]" unit="%">
-    <Method models="TPCSurgeProb" name="Alias">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
-        <Field abbreviation="PSurge17ftRun"/>
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge7ft6hr"/>
     </Method>
 </DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge8ftCumul_PHISH" name="PHISH probability &gt; 8 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge8ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge8ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 8 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge8ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge8ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge8ftIncr_PHISH" name="PHISH probability &gt; 8 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge8ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge9ftCumul_PHISH" name="PHISH probability &gt; 9 feet - cumulative [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge9ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge9ftCumul_wTide" name="Psurge + Tide [NAVD88] probability &gt; 9 feet" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge9ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge9ftIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="PSurge9ftIncr_PHISH" name="PHISH probability &gt; 9 feet - incremental [agl]" unit="%">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="PSurge9ft6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge10pctCumul_PHISH" name="PHISH height w/10% chance of being exceeded - cumulative [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge10pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge10pctCumul_wTide" name="Psurge + Tide [NAVD88] height w/10% chance of being exceeded" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge10pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge10pctIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge10pctIncr_PHISH" name="PHISH height w/10% chance of being exceeded - incremental [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge10pct6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge20pctCumul_PHISH" name="PHISH height w/20% chance of being exceeded - cumulative [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge20pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge20pctCumul_wTide" name="Psurge + Tide [NAVD88] height w/20% chance of being exceeded" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge20pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge20pctIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge20pctIncr_PHISH" name="PHISH height w/20% chance of being exceeded - incremental [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge20pct6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge30pctCumul_PHISH" name="PHISH height w/30% chance of being exceeded - cumulative [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge30pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge30pctCumul_wTide" name="Psurge + Tide [NAVD88] height w/30% chance of being exceeded" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge30pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge30pctIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge30pctIncr_PHISH" name="PHISH height w/30% chance of being exceeded - incremental [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge30pct6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge40pctCumul_PHISH" name="PHISH height w/40% chance of being exceeded - cumulative [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge40pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge40pctCumul_wTide" name="Psurge + Tide [NAVD88] height w/40% chance of being exceeded" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge40pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge40pctIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge40pctIncr_PHISH" name="PHISH height w/40% chance of being exceeded - incremental [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge40pct6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_PHISH.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge50pctCumul_PHISH" name="PHISH height w/50% chance of being exceeded - cumulative [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from PHISH.
+         This makes it possible to easily distinguish it from the cumulative surge from Psurge + Tide. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge50pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctCumul_wTide.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge50pctCumul_wTide" name="Psurge + Tide [NAVD88] height w/50% chance of being exceeded" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the cumulative surge that is coming from Psurge + Tide.
+         This makes it possible to easily distinguish it from the cumulative surge from PHISH. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge50pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/Surge50pctIncr_PHISH.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="Surge50pctIncr_PHISH" name="PHISH height w/50% chance of being exceeded - incremental [agl]" unit="ft">
+    <!-- This parameter provides a custom legend and parameter name for the incremental surge that is coming from PHISH -->
+    <Method models="TPCSurgeProb" name="Alias" levels="0FHAG">
+        <Field abbreviation="Surge50pct6hr"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG" name="Probabilistic Storm Surge height w/10% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge10pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG518E2.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-518E2" name="Probabilistic Storm Surge probability &gt; 17 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge17ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG549E2.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-549E2" name="Probabilistic Storm Surge probability &gt; 18 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge18ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG579E2.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-579E2" name="Probabilistic Storm Surge probability &gt; 19 feet" unit="%">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="PSurge19ftCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-60" name="Probabilistic Storm Surge height w/60% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge60pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-70" name="Probabilistic Storm Surge height w/70% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge70pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-80" name="Probabilistic Storm Surge height w/80% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge80pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<DerivedParameter abbreviation="TPCSG-90" name="Probabilistic Storm Surge height w/90% chance of being exceeded" unit="ft">
+    <!-- This parameter maps the newer PSurge2.0 + Tide parameter abbreviation to the older PSurge1.0
+         abbreviation so that bundles and menus designed for PSurge1.0 can load the newer data.
+         This parameter should be considered deprecated and can be removed in the future. -->
+    <Method models="TPCSurgeProb" name="Alias" levels="Surface">
+        <Field abbreviation="Surge90pctCumul"/>
+    </Method>
+</DerivedParameter>

cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java

@@ -80,7 +80,7 @@ import com.raytheon.uf.viz.monitor.ffmp.ui.dialogs.FfmpTableConfigData;
  * July 1, 2013    2155   dhladky     Fixed bug that created more rows than were actually needed.
  * Jul 15, 2013 2184        dhladky     Remove all HUC's for storage except ALL
  * Jul 16, 2013    2197   njensen     Use FFMPBasinData.hasAnyBasins() for efficiency
- * Jan 09, 2014   DR16096 gzhang	  Fix QPFSCAN not showing M issue for different radar source.
+ * May 19, 2014   DR16096 gzhang	  Fix QPFSCAN not showing M issue for different radar source.
  * 
  * </pre>
  * @author dhladky
@@ -182,14 +182,14 @@ public class FFMPDataGenerator {
             }
 
             List<DomainXML> domains = resource.getDomains();
-
+            List<List<Long>> huclistsAll = getOtherSiteQpfBasins(siteKey,FFMPRecord.ALL, domains);// DR 16096
             if ((centeredAggregationKey == null) || huc.equals(FFMPRecord.ALL)) {
 
                 if (huc.equals(FFMPRecord.ALL)) {
 
                     FFMPBasinData fbd = baseRec.getBasinData();
                     tData = new FFMPTableData(fbd.getBasins().size());
-                    List<List<Long>> huclists = getOtherSiteQpfBasins(siteKey,huc, domains);// DR 16096 
+ 
                     for (Long key : fbd.getBasins().keySet()) {
 
                         FFMPBasinMetaData fmdb = ft.getBasin(siteKey, key);
@@ -199,7 +199,7 @@ public class FFMPDataGenerator {
                             continue;
 
                         }
-                        this.filterOtherSiteHucs(huclists, key);// DR 16096 
+                        this.filterOtherSiteHucs(huclistsAll, key, false);// DR 16096 
                         for (DomainXML domain : domains) {
 
                             String cwa = domain.getCwa();
@@ -269,7 +269,7 @@ public class FFMPDataGenerator {
                             if (fmdb != null) {
 
                                 try {
-                                	this.filterOtherSiteHucs(huclists, key);// DR 16096
+                                	this.filterOtherSiteHucs(huclists, key, true);// DR 16096
                                     FFMPBasin basin = new FFMPBasin(key, true);
                                     setFFMPRow(basin, tData, isVGB, null);
 
@@ -304,7 +304,7 @@ public class FFMPDataGenerator {
                             if ((domain.getCwa().equals(fmdb.getCwa()))
                                     || (domain.isPrimary() && fmdb
                                             .isPrimaryCwa())) {
-
+                            	this.filterOtherSiteHucs(huclistsAll, key,false);
                                 setFFMPRow(fbd.get(key), tData, false, null);
 
                                 if (virtualBasin != null) {
@@ -538,24 +538,24 @@ public class FFMPDataGenerator {
 
         //if(siteKey.equalsIgnoreCase(dqpf))//Basin Table same as QPFSCAN's datakey
         //        return huclist;
+        //System.out.println("@541----------- qpf: "+dqpf);//checking qpf type
         
-        System.out.println("@551----------- qpf: "+dqpf);//checking qpf type
 
         java.util.ArrayList<String> dataKeys = this.getDisplayingQpfDataKeys(dqpf);//more than one datakey for mosaic QPFSCAN
-        for(String site : dataKeys){
+        for(String site : dataKeys){//System.out.println("@545----------- qpf-site: "+site);
                 huclist.add(ft.getHucKeyList(site, huc, domains));
         }
         
         return huclist;
     }
 
-    private FFMPBasinData qpfBasinClone = null;// DR 16096 2014-01-06 initialized @435
+    private FFMPBasinData qpfBasinClone = null;// DR 16096 initialized @435
 
-    public void filterOtherSiteHucs(List<List<Long>> huclists, Long key){
+    public void filterOtherSiteHucs(List<List<Long>> huclists, Long key, boolean isAggregate){
     	if( huclists==null || huclists.size()==0) // QPFSCAN column is not on 2014-01-09
     		return;
         boolean isInOtherSite = false;
-
+/*
         for(List<Long> list : huclists){
         	if(list.contains(key)){
         		isInOtherSite = true;
@@ -568,8 +568,21 @@ public class FFMPDataGenerator {
         	setQPFMissing();
         	setMList(this.siteKey,this.huc, key);
         }// so in FFMPRowGenerator, qpf value will be Float.NaN
+*/        
+        if(isAggregate){
+        	this.setHucLevelQpf(key);
+        	return;//FFMPResource.getBasin(,QPF,,) not for aggregate
+        }
         
-        //if(key==31051 || key==31119){setQPFMissing(); setMList(this.siteKey,this.huc, key);}//hard-code for testing	
+        //Only for non-aggregates; fix NO DATA shows 0.0
+        try{
+	        if( Float.isNaN(resource.getBasin(key, FFMPRecord.FIELDS.QPF, this.paintRefTime, false).getValue()))
+	        	setQPFMissing();	
+	        else
+	        	this.qpfBasin = this.qpfBasinClone;
+        }catch(Exception e){
+        	statusHandler.info("FFMPResource.getBasin Exception: "+e.getMessage());
+        }
 
     }
 
@@ -642,6 +655,29 @@ public class FFMPDataGenerator {
     //Utilize the fact FFMPRowGenerator set QPFSCAN M if qpfBasin null
     private void setQPFMissing(){
     	this.qpfBasin = null;
-    }    
+    }  
+    
+    //Loop through the HUC's basins to check if there are values not NaN
+    //then set qpf; otherwise set the HUC level M.
+    //centeredAggregationKey NULL: not a specific huc (COUNTY,HUC0,etc) clicked
+    
+    private void setHucLevelQpf(Long key){
+    	
+    	List<Long> list = this.monitor.getTemplates(this.siteKey).getAggregatePfafs(key, this.siteKey, this.huc);
+    	boolean hasValue = false;
+    	
+    	for(Long bkey : list){
+    		try {
+				if( ! Float.isNaN(resource.getBasin(bkey, FFMPRecord.FIELDS.QPF, this.paintRefTime, false).getValue())){ 
+					hasValue = true;
+					break; // one is enough
+				}
+			} catch (VizException e) {
+				statusHandler.info("FFMPResource.getBasin Exception: "+e.getMessage());
+			}
+    	}
+    	
+    	qpfBasin = hasValue ? this.qpfBasinClone : null;
+    }
 
 }

cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java

@@ -177,12 +177,13 @@ import com.vividsolutions.jts.geom.Point;
  * Jun 27, 2013  2152       njensen     More thorough disposeInternal()
  * Jul 15, 2013 2184        dhladky     Remove all HUC's for storage except ALL
  * Jul 17, 2013  2197       njensen     Improved speed of getName()
- * Oct 18, 2013  DR 16151	gzhang		Used getAverageValue() for QPF Graph.
+ * Oct 18, 2013  DR 16151   gzhang      Used getAverageValue() for QPF Graph.
- * Jan 21, 2014  DR 15874   gzhang		Use getValue() for QPFSCAN independent. 
+ * Jan 21, 2014  DR 15874   gzhang      Use getValue() for QPFSCAN independent. 
  * Feb 19, 2014 2819        randerso    Removed unnecessary .clone() call
  * Mar  3, 2014 2804        mschenke    Set back up clipping pane
  * Apr 30, 2014  DR 16148   gzhang      Filter Basin Dates for Trend and Table Gap. 
  * May 05, 2014 3026        mpduff      Display Hpe bias source.
+ * May 19, 2014  DR 16096   gzhang      Make getBasin() protected for FFMPDataGenerator.
  * </pre>
  * 
  * @author dhladky
@@ -630,7 +631,7 @@ public class FFMPResource extends
      * @return
      * @throws VizException
      */
-    private FFMPBasin getBasin(Long key, FFMPRecord.FIELDS bfield,
+    protected FFMPBasin getBasin(Long key, FFMPRecord.FIELDS bfield,
             Date recentTime, boolean aggregate) throws VizException {
         FFMPBasin basin = null;
         if (aggregate) {
@@ -830,9 +831,7 @@ public class FFMPResource extends
                     switch (field) {
                     case QPF: {
                         value = getBasin(key, field, recentTime, aggregate)
-                                .getValue(recentTime);// DR 15874
+                                .getValue(recentTime);
-                        // .getAverageValue(recentTime,
-                        // getQpfSourceExpiration());
                         break;
                     }
                     case GUIDANCE: {

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/cachedata/CacheGuidanceRequest.java

@@ -34,6 +34,7 @@ import com.raytheon.viz.aviation.guidance.GuidanceRequest;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Apr 20, 2011 8065       rferrel     Initial creation
+ * 09Apr2014    #3005      lvenable    Added hashcode method.
  * 
  * </pre>
  * 
@@ -76,4 +77,13 @@ public class CacheGuidanceRequest extends GuidanceRequest {
         }
         return false;
     }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        final int prime = 31;
+        result = (prime * result) + ((siteID == null) ? 0 : siteID.hashCode());
+        return result;
+    }
+
 }

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/cachedata/PythonCacheGuidanceJob.java

@@ -22,8 +22,11 @@ package com.raytheon.viz.aviation.cachedata;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import jep.JepException;
 
@@ -56,6 +59,10 @@ import com.raytheon.viz.aviation.monitor.AvnPyUtil;
  *                                      adding dispose listener when not on the
  *                                      UI thread.
  * Aug 26, 2013 #2283      lvenable    Cleaned up some synchronized code.
+ * 09Apr2014    #3005      lvenable    Remove waitMonitor, replaced waitList array with a Set,
+ *                                     updated queueList to be a LinkedHashSet, added a catch
+ *                                     to capture a throwable to prevent the thread from dying
+ *                                     prematurely.
  * 
  * </pre>
  * 
@@ -90,17 +97,12 @@ public class PythonCacheGuidanceJob extends
     /**
      * Current executing thread or null if none pending.
      */
-    private CacheGuidanceRequest request = null;
+    private volatile CacheGuidanceRequest request = null;
 
     /**
-     * List of requests whose results are waiting to be cached.
+     * Set of requests whose results are waiting to be cached.
      */
-    private List<CacheGuidanceRequest> waitList;
+    private Set<CacheGuidanceRequest> waitSet;
-
-    /**
-     * Object to synchronize threads waiting on requests.
-     */
-    private Object waitMonitor;
 
     /**
      * Object to synchronize suspending/restarting the instance of this class.
@@ -146,10 +148,9 @@ public class PythonCacheGuidanceJob extends
     private PythonCacheGuidanceJob(String name) {
         super(name);
         siteObjMaps = new HashMap<String, Map<String, String>>();
-        waitMonitor = new Object();
         suspendMonitor = new Object();
         suspendJob = false;
-        waitList = new ArrayList<CacheGuidanceRequest>();
+        waitSet = new HashSet<CacheGuidanceRequest>();
     }
 
     /**
@@ -202,9 +203,9 @@ public class PythonCacheGuidanceJob extends
      * @param req
      */
     private void waitAdd(CacheGuidanceRequest req) {
-        synchronized (waitMonitor) {
+        synchronized (waitSet) {
-            if (waitList.contains(req) == false) {
+            if (waitSet.contains(req) == false) {
-                waitList.add(req);
+                waitSet.add(req);
             }
         }
     }
@@ -215,9 +216,9 @@ public class PythonCacheGuidanceJob extends
      * @param req
      */
     private void waitRemove(CacheGuidanceRequest req) {
-        synchronized (waitMonitor) {
+        synchronized (waitSet) {
-            waitList.remove(req);
+            waitSet.remove(req);
-            waitMonitor.notify();
+            waitSet.notifyAll();
         }
     }
 
@@ -229,31 +230,21 @@ public class PythonCacheGuidanceJob extends
      */
     private synchronized void addToQueue(
             List<CacheGuidanceRequest> cacheRequests) {
-        ArrayList<CacheGuidanceRequest> queueList = new ArrayList<CacheGuidanceRequest>();
+
+        Set<CacheGuidanceRequest> queueSet = new LinkedHashSet<CacheGuidanceRequest>(
+                cacheRequests);
+
         for (CacheGuidanceRequest req : cacheRequests) {
             waitAdd(req);
         }
 
-        // Get pending request to add after the cacheRequests.
+        queue.drainTo(queueSet);
-        while (queue.peek() != null) {
+
-            CacheGuidanceRequest qReq = queue.poll();
+        if (request != null) {
-            if (cacheRequests.contains(qReq) == false) {
+            queueSet.remove(request);
-                queueList.add(qReq);
-            }
         }
 
-        // Add cache request to head of the queue unless it is the current
+        queue.addAll(queueSet);
-        // request.
-        for (CacheGuidanceRequest req : cacheRequests) {
-            if (req.equals(request) == false) {
-                queue.add(req);
-            }
-        }
-
-        // Queue other pending requests.
-        for (CacheGuidanceRequest qReq : queueList) {
-            queue.add(qReq);
-        }
     }
 
     /**
@@ -266,15 +257,15 @@ public class PythonCacheGuidanceJob extends
         addToQueue(cacheRequests);
         try {
             for (CacheGuidanceRequest req : cacheRequests) {
-                synchronized (waitMonitor) {
+                synchronized (waitSet) {
-                    while (waitList.contains(req)) {
+                    while (waitSet.contains(req)) {
-                        waitMonitor.wait();
+                        waitSet.wait();
-                        // Notify another waiting thread.
-                        waitMonitor.notify();
                     }
                 }
             }
         } catch (InterruptedException e) {
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error occurred when requested were being cached...", e);
         }
     }
 
@@ -368,60 +359,60 @@ public class PythonCacheGuidanceJob extends
         }
         try {
             while (shutdown == false) {
-                if (suspendJob == true) {
+
-                    synchronized (suspendMonitor) {
+                try {
-                        queue.clear();
+                    if (suspendJob == true) {
-                        siteObjMaps.clear();
+                        synchronized (suspendMonitor) {
-                        suspendMonitor.wait();
+                            queue.clear();
-                    }
+                            siteObjMaps.clear();
-                    continue;
+                            suspendMonitor.wait();
-                }
-                if (queue.peek() != null) {
-                    request = queue.poll();
-                    Map<String, Object> args = request.getPythonArguments();
-                    String methodName = request.getGuidanceType()
-                            .getPythonMethod() + "Retrieve";
-                    try {
-                        // long t0 = System.currentTimeMillis();
-                        String result = (String) python.execute(methodName,
-                                args);
-                        // long t1 = System.currentTimeMillis();
-                        String siteID = request.getSiteID();
-                        String tag = request.getTag();
-                        setSiteObj(siteID, tag, result);
-                        // System.out.println("Python cache guidance time: "
-                        // + (t1 - t0) + ", " + siteID + " - " + tag);
-                        waitRemove(request);
-                    } catch (JepException e) {
-                        if (e.getMessage().contains("NoDataException")) {
-                            String msg = e.getMessage().split("'")[3];
-                            statusHandler.handle(Priority.PROBLEM, msg, e);
-                        } else {
-                            statusHandler.handle(Priority.PROBLEM,
-                                    "Error generating guidance", e);
                         }
-                    } finally {
+                        continue;
-                        request = null;
                     }
-                } else {
+                    if (queue.peek() != null) {
-                    try {
+                        request = queue.poll();
-                        Thread.sleep(20);
+                        Map<String, Object> args = request.getPythonArguments();
-                    } catch (InterruptedException e) {
+                        String methodName = request.getGuidanceType()
-                        break;
+                                .getPythonMethod() + "Retrieve";
+                        try {
+                            String result = (String) python.execute(methodName,
+                                    args);
+                            String siteID = request.getSiteID();
+                            String tag = request.getTag();
+                            setSiteObj(siteID, tag, result);
+                            waitRemove(request);
+                        } catch (JepException e) {
+                            if (e.getMessage().contains("NoDataException")) {
+                                String msg = e.getMessage().split("'")[3];
+                                statusHandler.handle(Priority.PROBLEM, msg, e);
+                            } else {
+                                statusHandler.handle(Priority.PROBLEM,
+                                        "Error generating guidance", e);
+                            }
+                        } finally {
+                            request = null;
+                        }
+                    } else {
+                        try {
+                            Thread.sleep(20);
+                        } catch (InterruptedException e) {
+                            break;
+                        }
                     }
+                } catch (Throwable t) {
+                    statusHandler.handle(Priority.PROBLEM,
+                            "Error generating guidance", t);
                 }
             }
-        } catch (InterruptedException e) {
-            // Just go away
         } finally {
             siteObjMaps.clear();
             if (python != null) {
                 python.dispose();
                 python = null;
             }
-            synchronized (waitMonitor) {
+            synchronized (waitSet) {
-                waitList.clear();
+                waitSet.clear();
-                waitMonitor.notify();
+                waitSet.notifyAll();
             }
         }
         return Status.OK_STATUS;

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java

@@ -58,8 +58,10 @@ import com.raytheon.viz.aviation.resource.ResourceConfigMgr.ResourceTag;
  * 12/01/2010   3263       rferrel     Added mouse track listener in order to
  *                                     display tool tip in dataStTxt.
  * 12/09/2010   7380       rferrel     Remove no longer needed constructor and now
- *                                     adjust both hight and width of text filed.
+ *                                     adjust both height and width of text filed.
  * 12 Aug 2013  #2256      lvenable    Added code to dispose of the cursor.
+ * 09Apr2014    #3005      lvenable    Added methods to clear the header and data text controls or
+ *                                     mark then as updating.  Removed unused methods.
  * 
  * </pre>
  * 
@@ -331,13 +333,19 @@ public class HeaderTextComp extends Composite {
     }
 
     /**
-     * Method that sets the header styled text edit area.
+     * Clear the header text and data text controls.
-     * 
-     * @param headerStTxt
-     *            the headerStTxt to set
      */
-    public void setHeaderStTxt(StyledText headerStTxt) {
+    public void clearTextControls() {
-        this.headerStTxt = headerStTxt;
+        headerStTxt.setText("");
+        dataStTxt.setText("");
+    }
+
+    /**
+     * Set the header text and data text controls to display "updating...".
+     */
+    public void markTextAsUpdating() {
+        headerStTxt.setText("updating...");
+        dataStTxt.setText("updating...");
     }
 
     /**
@@ -348,14 +356,4 @@ public class HeaderTextComp extends Composite {
     public StyledText getDataStTxt() {
         return dataStTxt;
     }
-
-    /**
-     * Method that sets the data styled text edit area.
-     * 
-     * @param dataStTxt
-     *            the dataStTxt to set
-     */
-    public void setDataStTxt(StyledText dataStTxt) {
-        this.dataStTxt = dataStTxt;
-    }
 }

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

@@ -234,6 +234,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 02/12/2014   17076       lvenable    Mark guidance tabs as not current so they get refreshed
  * 02/19/2014   16980       zhao        add code to ensure the Alt flag is false after the Alt kay is released
  * 21Mar2014    #2925       lvenable    Fixed NPE error found during testing.
+ * 09Apr2014    #3005       lvenable    Added calls to mark the tabs as not current when the tabs are changed.
+ *                                      This will show the tab as updating in the header and data text controls.
  * 
  * </pre>
  * 
@@ -787,6 +789,7 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
         for (TabItem tbi : guidanceViewerFolder.getItems()) {
             if (tbi.getControl() instanceof ViewerTab) {
                 ((ViewerTab) tbi.getControl()).setDisplayCurrent(false);
+                ((ViewerTab) tbi.getControl()).markTextAsUpdating();
             }
         }
     }
@@ -2036,7 +2039,7 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
                             .getSelectionIndex());
                     String bbb = editorTafTabComp.getBBB();
 
-                    // DR16478
+                    // DR166478
                     if (toolName.equals("UseMetarForPrevailing")) {
                         if (checkBasicSyntaxError(true)) {
                             return;
@@ -2394,6 +2397,7 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
                             .getSelectionIndex());
                     String site = currentTab.getSite(siteID);
                     currentTab.generateGuidance(site);
+                    currentTab.markTextAsUpdating();
                 }
             }
 
@@ -4348,11 +4352,7 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
             populateTafViewer();
 
             // Mark tab displays no longer current.
-            for (TabItem tbi : guidanceViewerFolder.getItems()) {
+            markTabsAsNotCurrent();
-                if (tbi.getControl() instanceof ViewerTab) {
-                    ((ViewerTab) tbi.getControl()).setDisplayCurrent(false);
-                }
-            }
 
             // Update the metar and mos guidance in the viewer tab.
             updateViewerTab(stationName);

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/GuidanceRequest.java

@@ -36,6 +36,7 @@ import com.raytheon.uf.viz.core.jobs.QueueJobRequest;
  * Jul 28, 2009            njensen     Initial creation
  * Nov 12, 2010 6195       rferrel     Added types for clearing cache.
  * Apr 14, 2011 8065       rferrel     Implement equals
+ * 10Apr2014    #3005      lvenable    Added Eclipse generated hashcode method.
  * 
  * </pre>
  * 
@@ -212,6 +213,19 @@ public class GuidanceRequest extends QueueJobRequest<String[]> {
         this.tag = tag;
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((format == null) ? 0 : format.hashCode());
+        result = prime * result
+                + ((guidanceType == null) ? 0 : guidanceType.hashCode());
+        result = prime * result + ((model == null) ? 0 : model.hashCode());
+        result = prime * result + ((siteIDs == null) ? 0 : siteIDs.hashCode());
+        result = prime * result + ((tag == null) ? 0 : tag.hashCode());
+        return result;
+    }
+
     /*
      * (non-Javadoc)
      * 

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/MetarViewer.java

@@ -63,7 +63,10 @@ import com.raytheon.viz.aviation.resource.ResourceConfigMgr.ResourceTag;
  *                                     and set default value for check hours.
  * 04/28/2011   8065       rferrel     Add flag to indicate display is current
  *                                     and implement data caching
- * 31JUL2012    14570      zhao        Highlight Metar alert for case of 'cat'  
+ * 31JUL2012    14570      zhao        Highlight Metar alert for case of 'cat'
+ * 09Apr2014    #3005      lvenable    Added method call to mark the data and header text
+ *                                     controls to updating when the number
+ *                                     of hours has changed (via combo control).
  * 
  * </pre>
  * 
@@ -127,8 +130,10 @@ public class MetarViewer extends ViewerTab implements
      */
     private static final HashMap<String, String[]> alertMap = new HashMap<String, String[]>();
     static {
-    	//alertMap.put("cat", new String[] { "<vsby>", "</vsby>", "<sky>", "</sky>" }); // 14570
+        // alertMap.put("cat", new String[] { "<vsby>", "</vsby>", "<sky>",
-        alertMap.put("tempo", new String[] { "<vsby>", "</vsby>", "<wind>", "</wind>", "<wx>", "</wx>", "<sky>", "</sky>" }); // 14570
+        // "</sky>" }); // 14570
+        alertMap.put("tempo", new String[] { "<vsby>", "</vsby>", "<wind>",
+                "</wind>", "<wx>", "</wx>", "<sky>", "</sky>" }); // 14570
         alertMap.put("vsby", new String[] { "<vsby>", "</vsby>" });
         alertMap.put("wind", new String[] { "<wind>", "</wind>" });
         alertMap.put("wx", new String[] { "<wx>", "</wx>" });
@@ -256,6 +261,7 @@ public class MetarViewer extends ViewerTab implements
             @Override
             public void widgetSelected(SelectionEvent event) {
                 // Update the metar in the viewer tab.
+                markTextAsUpdating();
                 if (MetarViewer.this.allChk.getSelection()) {
                     allChkHrs = numHrsCbo.getItem(numHrsCbo.getSelectionIndex());
                 } else {
@@ -411,12 +417,13 @@ public class MetarViewer extends ViewerTab implements
 
             if (alertMap != null && alertMap.size() > 0) {
                 for (String key : alertMap.keySet()) {
-                	if ( key.equals("cat") ) { // "cat" involves "visibility" and "sky condition"
+                    if (key.equals("cat")) { // "cat" involves "visibility" and
-                		colorViewerAlert("vsby", configMgr);
+                                             // "sky condition"
-                		colorViewerAlert("sky", configMgr);
+                        colorViewerAlert("vsby", configMgr);
-                	} else {
+                        colorViewerAlert("sky", configMgr);
-                		colorViewerAlert(key, configMgr);
+                    } else {
-                	}
+                        colorViewerAlert(key, configMgr);
+                    }
                 }
             }
         }

cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/ViewerTab.java

@@ -63,6 +63,8 @@ import com.raytheon.viz.avnconfig.TafSiteData;
  * Apr 28,2011  8065       rferrel     Add flag to indicate display is current
  *                                     and implement data caching
  * Jun 1, 2011  9673       rferrel     Added fltCatFontColor.
+ * 09Apr2014    #3005      lvenable    Marked currentTab as volatile, added call through
+ *                                     methods to the HeaderTextComp class.
  * 
  * </pre>
  * 
@@ -141,7 +143,7 @@ public abstract class ViewerTab extends Composite {
     /**
      * True when tab is selected for display.
      */
-    private boolean currentTab = false;
+    private volatile boolean currentTab = false;
 
     /**
      * Flight Category's font color.
@@ -303,7 +305,7 @@ public abstract class ViewerTab extends Composite {
      * to determine the last request queued so it will be the one to populate
      * the tab.
      */
-    private AtomicInteger generatGuidanceCount = new AtomicInteger(
+    private AtomicInteger generateGuidanceCount = new AtomicInteger(
             Integer.MIN_VALUE);
 
     /**
@@ -317,7 +319,7 @@ public abstract class ViewerTab extends Composite {
      * @return cnt unique count that increases each time the method is called.
      */
     public int generateGuidance(String siteID) {
-        int cnt = generatGuidanceCount.incrementAndGet();
+        int cnt = generateGuidanceCount.incrementAndGet();
         this.siteID = siteID;
         setDisplayCurrent(false);
         return cnt;
@@ -331,7 +333,7 @@ public abstract class ViewerTab extends Composite {
     }
 
     /**
-     * This method must to be called by the implementing class' requestComoplete
+     * This method must be called by the implementing class' requestComplete
      * method after it has populated the textComp header and data section. This
      * updates the highlighting of the TAF text in the viewer and adjusts the
      * width of the this tab's header and data text component so they will stay
@@ -533,6 +535,20 @@ public abstract class ViewerTab extends Composite {
         }
     }
 
+    /**
+     * Clear the header and data text controls.
+     */
+    public void clearTextControls() {
+        textComp.clearTextControls();
+    }
+
+    /**
+     * Set the header and data text controls to show as updating.
+     */
+    public void markTextAsUpdating() {
+        textComp.markTextAsUpdating();
+    }
+
     /**
      * 
      * @return stationList list of sites tab needs to cache data for.
@@ -586,6 +602,7 @@ public abstract class ViewerTab extends Composite {
      */
     public void queueCacheRequests(final int cnt,
             final List<CacheGuidanceRequest> cacheRequests) {
+
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
@@ -593,7 +610,7 @@ public abstract class ViewerTab extends Composite {
                         cacheRequests);
                 // Update tab if still current and waiting for this request
                 if (ViewerTab.this.isDisposed() == false && isCurrentTab()
-                        && generatGuidanceCount.get() == cnt) {
+                        && generateGuidanceCount.get() == cnt) {
                     VizApp.runAsync(new Runnable() {
                         @Override
                         public void run() {