Changeset 21536 for branches/cnb_branch_20090215/ppStack/src/ppStackLoop.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/ppStackLoop.c (modified) (9 diffs)

branches/cnb_branch_20090215/ppStack/src/ppStackLoop.c

@@ -480 +480 @@
             psMetadataAddF32(stats, PS_LIST_TAIL, "STAMP.NUM", PS_META_DUPLICATE_OK,
                              "Number of stamps", kernels->numStamps);
+            float deconv = psMetadataLookupF32(NULL, readout->analysis,
+                                               PM_SUBTRACTION_ANALYSIS_DECONV_MAX); // Deconvolution fraction
+            psMetadataAddF32(stats, PS_LIST_TAIL, "KERNEL.DECONV", PS_META_DUPLICATE_OK,
+                             "Deconvolution fraction for kernel", deconv);
             psMetadataAddF32(stats, PS_LIST_TAIL, "PPSTACK.WEIGHTING", PS_META_DUPLICATE_OK,
                              "Weighting for image", weightings->data.F32[i]);
@@ -503 +507 @@
             psStringAppend(&name, "covariance_%d.fits", i);
             writeImage(name, hdu->header, readout->covariance->image, config);
+            pmStackVisualPlotTestImage(readout->covariance->image, name);
             psFree(name);
         }
@@ -801 +806 @@
 #ifdef TESTING
     writeImage("combined_initial.fits", NULL, outRO->image, config);
+    pmStackVisualPlotTestImage(outRO->image, "combined_initial.fits");
 #endif
 
@@ -884 +890 @@
                 psString name = NULL;           // Name of image
                 psStringAppend(&name, "inspect_%03d.fits", i);
+                pmStackVisualPlotTestImage(mask, name);
                 psFits *fits = psFitsOpen(name, "w");
                 psFree(name);
@@ -901 +908 @@
                 psString name = NULL;           // Name of image
                 psStringAppend(&name, "reject_%03d.fits", i);
+                pmStackVisualPlotTestImage(mask, name);
                 psFits *fits = psFitsOpen(name, "w");
                 psFree(name);
@@ -1034 +1042 @@
 
 #ifdef TESTING
+    pmStackVisualPlotTestImage(outRO->image, "combined_initial.fits");
     writeImage("combined_final.fits", NULL, outRO->image, config);
 #endif
@@ -1151 +1160 @@
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 7 : WCS & JPEGS : %f sec", psTimerClear("PPSTACK_STEPS"));
 
-    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
-        psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
-        if (!pmReadoutVarianceRenormPhot(outRO, maskValue, renormNum, renormWidth,
-                                         renormMean, renormStdev, NULL)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
-            psFree(outRO);
-            return false;
-        }
-    }
-
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 8 : Photometry Renormalization : %f sec", psTimerClear("PPSTACK_STEPS"));
-
     if (psMetadataLookupBool(&mdok, recipe, "PHOTOMETRY")) {
         psTrace("ppStack", 1, "Photometering stacked image....\n");
@@ -1199 +1189 @@
     }
 
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 9 : Photometry Analysis : %f sec", psTimerClear("PPSTACK_STEPS"));
+    psLogMsg("ppStack", PS_LOG_INFO, "Stage 8 : Photometry Analysis : %f sec", psTimerClear("PPSTACK_STEPS"));
 
     psThreadPoolFinalize();
@@ -1254 +1244 @@
     }
 
-    psLogMsg("ppStack", PS_LOG_INFO, "Stage 10 : Final Output : %f sec", psTimerClear("PPSTACK_STEPS"));
+    psLogMsg("ppStack", PS_LOG_INFO, "Stage 9 : Final Output : %f sec", psTimerClear("PPSTACK_STEPS"));
 
     memDump("finish");