Changeset 20492 for trunk/ppSub/src/ppSubReadout.c

Timestamp:

Oct 31, 2008, 4:04:13 PM (18 years ago)

Author:

Paul Price

Message:

Adding renormalisation of variance map.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -116 +116 @@
     int optOrder = psMetadataLookupS32(&mdok, recipe, "OPTIMUM.ORDER"); // Order for search
     bool dual = psMetadataLookupBool(&mdok, recipe, "DUAL"); // Dual convolution?
-    bool renorm = psMetadataLookupBool(&mdok, recipe, "RENORM"); // Renormalise weights?
-    int renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width for renormalise
 
     psString interpModeStr = psMetadataLookupStr(&mdok, recipe, "INTERPOLATION"); // Interpolation mode
@@ -433 +431 @@
     }
 
-    if (renorm) {
-        psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); // Random number generator
-        if (!pmReadoutWeightRenorm(outRO, maskBad, PS_STAT_ROBUST_MEDIAN, PS_STAT_ROBUST_STDEV,
-                                   renormWidth, rng)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to renormalise weights for photometry.");
+    if (psMetadataLookupBool(&mdok, recipe, "RENORM")) {
+        // Statistics for renormalisation
+        psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+                                                                                "RENORM.MEAN"));
+        psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+                                                                                 "RENORM.STDEV"));
+        int renormNum = psMetadataLookupS32(&mdok, recipe, "RENORM.NUM"); // Number of samples
+        float renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width of Gaussian phot
+        psMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
+        if (!pmReadoutWeightRenormPhot(outRO, maskValue, renormNum, renormWidth,
+                                       renormMean, renormStdev, NULL)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
             psFree(outRO);
             return false;
         }
-        psFree(rng);
     }