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

Issue #2940 More filenames printed, null from bad rec.

Browse source 
Former-commit-id: e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly e40c9a7be8 [formerly cd4921b35f] [formerly a2ef100bfc] [formerly dadc604ab3 [formerly a2ef100bfc [formerly 26bfd426965d208f92bcb1fcd650b5f2299724a4]]]]
Former-commit-id: dadc604ab3
Former-commit-id: af478efa5d [formerly e58fa39adc] [formerly 30f08e0872c7bff47d05e441f1dd1375d4fa9d03 [formerly f54cbb83a1]]
Former-commit-id: 703f3933ff157bb876bac2fb5586159e18bb37bb [formerly 07c49a82b5]
Former-commit-id: 24a1a5a0c6
This commit is contained in:
Dave Hladky 2014-05-07 14:51:38 -05:00
parent 88f134aef8
commit d740131519
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
View file

@ -95,12 +95,12 @@ import com.vividsolutions.jts.geom.Polygon;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* *
* 07/14/09 2152 D. Hladky Initial release * 07/14/09 2152 D. Hladky Initial release
* 10/25/12 DR 15514 G. Zhang Fix ConcurrentModificationException * 10/25/12 DR 15514 G. Zhang Fix ConcurrentModificationException
* 02/01/13 1569 D. Hladky Added constants * 02/01/13 1569 D. Hladky Added constants
* 02/25/13 1660 D. Hladky FFTI design change to help mosaic processing. * 02/25/13 1660 D. Hladky FFTI design change to help mosaic processing.
* 05/01/2013 15684 zhao Unlock when Exception caught * 05/01/2013 15684 zhao Unlock when Exception caught
* Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL * Jul 15, 2013 2184 dhladky Remove all HUC's for storage except ALL
* 09/03/2013 DR 13083 G. Zhang Added a fix in processRADAR(ArrayList<SourceBinEntry>). * 09/03/2013 DR 13083 G. Zhang Added a fix in processRADAR(ArrayList<SourceBinEntry>).
* 03 April 2014 2940 dhladky Better error message for bad configurations. * 03 April 2014 2940 dhladky Better error message for bad configurations.
* </pre> * </pre>
* @author dhladky * @author dhladky
@ -218,7 +218,7 @@ public class FFMPProcessor {
} }
statusHandler.handle(Priority.INFO, statusHandler.handle(Priority.INFO,
"Processed Source: " + ffmpRec.getSourceName() + " sitekey: " "Processed Source: " + source.getSourceName() + " sitekey: "
+ siteKey + " dataKey: " + dataKey + " time: " + siteKey + " dataKey: " + dataKey + " time: "
+ (System.currentTimeMillis() - time)); + (System.currentTimeMillis() - time));
@ -637,12 +637,12 @@ public class FFMPProcessor {
+ source.getDisplayName(); + source.getDisplayName();
} }
Date backDate = new Date(ffmpRec.getDataTime().getRefTime() Date backDate = new Date(ffmpRec.getDataTime().getRefTime()
.getTime()-(FFMPGenerator.SOURCE_CACHE_TIME * TimeUtil.MILLIS_PER_HOUR)); .getTime()-(FFMPGenerator.SOURCE_CACHE_TIME * TimeUtil.MILLIS_PER_HOUR));
FFMPDataContainer ffgContainer = generator FFMPDataContainer ffgContainer = generator
.getFFMPDataContainer(sourceNameString, .getFFMPDataContainer(sourceNameString,
backDate); backDate);
if (ffgContainer != null if (ffgContainer != null
&& ffgContainer.containsKey(source.getSourceName())) { && ffgContainer.containsKey(source.getSourceName())) {
@ -1139,19 +1139,19 @@ public class FFMPProcessor {
if (radarRec.getMnemonic().equals("DHR")) { if (radarRec.getMnemonic().equals("DHR")) {
for (int j = 0; j < dataVals.length; j++) { for (int j = 0; j < dataVals.length; j++) {
try { try {
val += ScanUtils.getZRvalue2(dataVals[j],//fval,// DR 13083 val += ScanUtils.getZRvalue2(dataVals[j],//fval,// DR 13083
dhrMap.get(DHRValues.ZRMULTCOEFF), dhrMap.get(DHRValues.ZRMULTCOEFF),
dhrMap.get(DHRValues.MAXPRECIPRATEALLOW), dhrMap.get(DHRValues.MAXPRECIPRATEALLOW),
dhrMap.get(DHRValues.ZRPOWERCOEFF), dhrMap.get(DHRValues.ZRPOWERCOEFF),
dhrMap.get(DHRValues.BIAS_TO_USE)) dhrMap.get(DHRValues.BIAS_TO_USE))
* areas[j]; * areas[j];
area += areas[j]; area += areas[j];
} catch (Exception e) { } catch (Exception e) {
statusHandler statusHandler
.error("DHR parameters are NULL, can't process!" .error("DHR parameters are NULL, can't process!"
+ e.getMessage()); + e.getMessage());
} }
} }
} else if (radarRec.getMnemonic().equals("DPR")) { } else if (radarRec.getMnemonic().equals("DPR")) {
@ -1826,18 +1826,25 @@ public class FFMPProcessor {
} }
/** /**
* Gets the XMRG data array * Gets the XMRG data array, checks HRAP/XMRG config for sanity.
* *
* @return * @return
*/ */
private short[][] getXMRGData() throws Exception { private short[][] getXMRGData() throws Exception {
String fileName = "MISSING";
if (xmrg.getFile() != null) {
fileName = xmrg.getFile().getAbsolutePath();
}
this.extent = getExtents(source.getHrapGridFactor()); this.extent = getExtents(source.getHrapGridFactor());
setHRAPSubGrid(extent, source.getHrapGridFactor()); setHRAPSubGrid(extent, source.getHrapGridFactor());
if (xmrg.getHrapExtent() != null) { if (xmrg.getHrapExtent() != null) {
xmrgData = xmrg.getData(extent); xmrgData = xmrg.getData(extent);
} else { } else {
throw new MalformedDataException("The XMRG data is malformed or the file is non-readable."); throw new MalformedDataException("The XMRG data is malformed or the file is non-readable. "+fileName);
} }
return xmrgData; return xmrgData;