Changeset 27838 for branches/tap_branches/ppSub/src/ppSubVarianceRescale.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ppSub/src (modified) (1 prop)
• ppSub/src/ppSubVarianceRescale.c (modified) (2 diffs)

branches/tap_branches/ppSub/src

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

branches/tap_branches/ppSub/src/ppSubVarianceRescale.c

@@ -35 +35 @@
     int num = psMetadataLookupS32(&mdok, recipe, "RENORM.NUM");
     if (!mdok) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "RENORM.NUM is not set in the recipe");
+        psError(PPSUB_ERR_ARGUMENTS, true, "RENORM.NUM is not set in the recipe");
         return false;
     }
     float minValid = psMetadataLookupF32(&mdok, recipe, "RENORM.MIN");
     if (!mdok) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "RENORM.MIN is not set in the recipe");
+        psError(PPSUB_ERR_ARGUMENTS, true, "RENORM.MIN is not set in the recipe");
         return false;
     }
     float maxValid = psMetadataLookupF32(&mdok, recipe, "RENORM.MAX");
     if (!mdok) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "RENORM.MAX is not set in the recipe");
+        psError(PPSUB_ERR_ARGUMENTS, true, "RENORM.MAX is not set in the recipe");
         return false;
     }
@@ -54 +54 @@
     pmReadout *readout = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT"); // Output image
 
+    if (!readout->variance) {
+        // Nothing to renormalise
+        psWarning("Renormalisation of the variance requested, but no variance provided.");
+        return true;
+    }
+
     return pmReadoutVarianceRenormalise(readout, maskBad, num, minValid, maxValid);
 }

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve