Changeset 17255 for trunk/ppStack/src/ppStackMatch.c

Timestamp:

Mar 31, 2008, 3:46:38 PM (18 years ago)

Author:

Paul Price

Message:

Adding renormalisation of variance maps.

File:

• trunk/ppStack/src/ppStackMatch.c (modified) (3 diffs)

trunk/ppStack/src/ppStackMatch.c

@@ -16 +16 @@
 
 bool ppStackMatch(pmReadout *readout, psArray **regions, psArray **kernels,
-                  const pmReadout *sourcesRO, const pmPSF *psf, const pmConfig *config)
+                  const pmReadout *sourcesRO, const pmPSF *psf, psRandom *rng, const pmConfig *config)
 {
     assert(readout);
@@ -30 +30 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, "PPSUB"); // PPSUB recipe
     int size = psMetadataLookupS32(NULL, recipe, "KERNEL.SIZE"); // Kernel half-size
+    psMaskType maskBad = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BAD"), config); // Value to mask
+    bool mdok;                          // Status of MD lookup
+    bool renorm = psMetadataLookupBool(&mdok, recipe, "RENORM"); // Renormalise variances?
+    psStatsOptions renormMean = psMetadataLookupS32(&mdok, recipe, "RENORM.MEAN"); // Statistic for mean
+    psStatsOptions renormStdev = psMetadataLookupS32(&mdok, recipe, "RENORM.STDEV"); // Statistic for stdev
+    int renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width for renormalisation box
+
+    // Renormalise the variances if desired
+    if (renorm && !pmReadoutWeightRenorm(readout, maskBad, renormMean, renormStdev, renormWidth, rng)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
+        psFree(output);
+        return false;
+    }
 
 #ifndef NO_CONVOLUTION
-    bool mdok;                          // Status of MD lookup
     int order = psMetadataLookupS32(NULL, recipe, "SPATIAL.ORDER"); // Spatial polynomial order
     float regionSize = psMetadataLookupF32(NULL, recipe, "REGION.SIZE"); // Size of iso-kernel regs
@@ -47 +59 @@
     int ringsOrder = psMetadataLookupS32(NULL, recipe, "RINGS.ORDER"); // RINGS polynomial order
     int binning = psMetadataLookupS32(NULL, recipe, "SPAM.BINNING"); // Binning for SPAM kernel
-    psMaskType maskBad = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BAD"),
-                                      config); // Value to mask
     psMaskType maskBlank = pmConfigMask(psMetadataLookupStr(NULL, recipe, "MASK.BLANK"),
                                         config); // Mask for blank reg.