Changeset 28121

Timestamp:

May 26, 2010, 3:53:34 PM (16 years ago)

Author:

Paul Price

Message:

Failure to have a reasonable variance renormalisation factor is now a data quality issue.

Location:

trunk/ppSub/src

Files:

• ppSub.h (modified) (1 diff)
• ppSubErrorCodes.dat (modified) (1 diff)
• ppSubLoop.c (modified) (1 diff)
• ppSubVarianceRescale.c (modified) (2 diffs)

trunk/ppSub/src/ppSub.h

@@ -111 +111 @@
 
 /// Perform Variance correction (rescale within a modest range)
-bool ppSubVarianceRescale(pmConfig *config   ///< Configuration
+bool ppSubVarianceRescale(pmConfig *config,   ///< Configuration
+                          ppSubData *data     ///< Processing data
     );
 

trunk/ppSub/src/ppSubErrorCodes.dat

@@ -11 +11 @@
 NO_OVERLAP              No overlap between input and skycell
 PROG                    Programming error
+VARIANCE                Variance renormalisation out of bounds

trunk/ppSub/src/ppSubLoop.c

@@ -119 +119 @@
 
     // Perform Variance correction (rescale within a modest range)
-    if (!ppSubVarianceRescale(config)) {
+    if (!ppSubVarianceRescale(config, data)) {
         psError(psErrorCodeLast(), false, "Unable to rescale variance.");
         return false;
+    }
+
+    if (data->quality) {
+        // Done all we can do up to this point
+        return true;
     }
 

trunk/ppSub/src/ppSubVarianceRescale.c

@@ -22 +22 @@
 #include "ppSub.h"
 
-bool ppSubVarianceRescale(pmConfig *config)
+bool ppSubVarianceRescale(pmConfig *config, ppSubData *data)
 {
     psAssert(config, "Require configuration");
@@ -60 +60 @@
     }
 
-    return pmReadoutVarianceRenormalise(readout, maskBad, num, minValid, maxValid);
+    if (!pmReadoutVarianceRenormalise(readout, maskBad, num, minValid, maxValid)) {
+        psErrorStackPrint(stderr, "Unable to renormalise variances");
+        psWarning("Unable to renormalise variances --- suspect bad data quality.");
+        // Allow the convolved and subtracted images to be written
+        ppSubDataQuality(data, PPSUB_ERR_VARIANCE,
+                         PPSUB_FILES_INPUT | PPSUB_FILES_PHOT_SUB | PPSUB_FILES_PHOT_INV |
+                         PPSUB_FILES_PSF | PPSUB_FILES_PHOT);
+    }
+
+    return true;
 }