Changeset 21536 for branches/cnb_branch_20090215/ppStack/src/ppStackMatch.c

Timestamp:

Feb 19, 2009, 7:59:50 AM (17 years ago)

Author:

beaumont

Message:

Added visualizations to ppSub. Set up a single variable in pmVisual to control when plots are drawn.

File:

• branches/cnb_branch_20090215/ppStack/src/ppStackMatch.c (modified) (8 diffs)

branches/cnb_branch_20090215/ppStack/src/ppStackMatch.c

@@ -189 +189 @@
 
     bool mdok;                          // Status of MD lookup
-    bool renorm = psMetadataLookupBool(&mdok, recipe, "RENORM"); // Renormalise variances?
     float penalty = psMetadataLookupF32(NULL, ppsub, "PENALTY"); // Penalty for wideness
     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
@@ -359 +358 @@
                 psString name = NULL;
                 psStringAppend(&name, "fake_%03d.fits", numInput);
+                pmStackVisualPlotTestImage(fake->image, name);
                 psFits *fits = psFitsOpen(name, "w");
                 psFree(name);
@@ -368 +368 @@
                 psString name = NULL;
                 psStringAppend(&name, "real_%03d.fits", numInput);
+                pmStackVisualPlotTestImage(readout->image, name);
                 psFits *fits = psFitsOpen(name, "w");
                 psFree(name);
@@ -374 +375 @@
             }
 #endif
-
-            // Renormalise the variances if desired
-            if (renorm) {
-                // Statistics for renormalisation
-                psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                        "RENORM.MEAN"));
-                psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                         "RENORM.STDEV"));
-
-                if (!pmReadoutVarianceRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-                    psFree(output);
-                    return false;
-                }
-            }
 
             if (threads > 0) {
@@ -413 +399 @@
                 psString name = NULL;
                 psStringAppend(&name, "conv_%03d.fits", numInput);
+                pmStackVisualPlotTestImage(output->image, name);
                 psFits *fits = psFitsOpen(name, "w");
                 psFree(name);
@@ -422 +409 @@
                 psString name = NULL;
                 psStringAppend(&name, "diff_%03d.fits", numInput);
+                pmStackVisualPlotTestImage(fake->image, name);
                 psFits *fits = psFitsOpen(name, "w");
                 psFree(name);
@@ -562 +550 @@
     }
 
-    // Renormalise the variances if desired
-    if (renorm) {
-        // Statistics for renormalisation
-        psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                "RENORM.MEAN"));
-        psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
-                                                                                 "RENORM.STDEV"));
-
-        if (!pmReadoutVarianceRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-            psFree(output);
-            return false;
-        }
-    }
-
     // Ensure the background value is zero
     psStats *bg = psStatsAlloc(PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_STDEV); // Statistics for background
@@ -664 +637 @@
         psString name = NULL;
         psStringAppend(&name, "convolved_%03d.fits", numInput);
+        pmStackVisualPlotTestImage(output->image, name);
         psFits *fits = psFitsOpen(name, "w");
         psFree(name);