Changeset 28013 for trunk/psphot/src/psphotStackReadout.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotStackReadout.c (modified) (7 diffs)

trunk/psphot/src/psphotStackReadout.c

@@ -1 +1 @@
 # include "psphotInternal.h"
+
+# define STACK_RAW "PSPHOT.STACK.INPUT.RAW"
+# define STACK_OUT "PSPHOT.STACK.OUTPUT.IMAGE"
 
 bool psphotStackReadout (pmConfig *config, const pmFPAview *view) {
@@ -17 +20 @@
     PS_ASSERT_PTR_NON_NULL (breakPt, false);
 
+    // we have 3 relevant files: RAW, CNV, OUT 
+
     // set the photcode for each image
-    if (!psphotAddPhotcode (config, view)) {
+    if (!psphotAddPhotcode (config, view, STACK_OUT)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -24 +29 @@
 
     // Generate the mask and weight images
-    if (!psphotSetMaskAndVariance (config, view)) {
-        return psphotReadoutCleanup (config, view);
+    // XXX this should be done before we perform the convolutions
+    if (!psphotSetMaskAndVariance (config, view, STACK_RAW)) {
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
     if (!strcasecmp (breakPt, "NOTHING")) {
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
     // generate a background model (median, smoothed image)
     // XXX I think this is not defined correctly for an array of images.
-    if (!psphotModelBackground (config, view)) {
-        return psphotReadoutCleanup (config, view);
+    // XXX probably need to subtract the model (same model?) for both RAW and OUT
+    if (!psphotModelBackground (config, view, STACK_RAW)) {
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
-    if (!psphotSubtractBackground (config, view)) {
-        return psphotReadoutCleanup (config, view);
+    if (!psphotSubtractBackground (config, view, STACK_RAW)) {
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
     if (!strcasecmp (breakPt, "BACKMDL")) {
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
@@ -47 +54 @@
     if (!psphotLoadPSF (config, view)) {
         psError (PSPHOT_ERR_UNKNOWN, false, "error loading psf model");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
-    if (!psphotStackChisqImage(config, view)) {
+    if (!psphotStackChisqImage(config, view, STACK_RAW, STACK_OUT)) {
         psError (PSPHOT_ERR_UNKNOWN, false, "failure to generate chisq image");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
     if (!strcasecmp (breakPt, "CHISQ")) {
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
     // find the detections (by peak and/or footprint) in the image.
     // This finds the detections on Chisq image as well as the individuals
-    if (!psphotFindDetections (config, view, true)) { // pass 1
+    if (!psphotFindDetections (config, view, STACK_RAW, true)) { // pass 1
         // this only happens if we had an error in psphotFindDetections
         psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
+    }
+
+    // copy the detections from RAW to OUT
+    if (!psphotCopySources (config, view, STACK_OUT, STACK_RAW)) {
+        psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
     // construct sources and measure basic stats (saved on detections->newSources)
     // only run this on detections from the input images, not chisq image
-    if (!psphotSourceStats (config, view, true)) { // pass 1
+    if (!psphotSourceStats (config, view, STACK_OUT, true)) { // pass 1
         psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
-    // *** generate the objects (which unify the sources from the different images)
-    psArray *objects = psphotMatchSources (config, view);
+    // generate the objects (object unify the sources from the different images)
+    psArray *objects = psphotMatchSources (config, view, STACK_OUT);
 
     // construct sources for the newly-generated sources (from other images)
-    if (!psphotSourceStats (config, view, false)) { // pass 1
+    if (!psphotSourceStats (config, view, STACK_OUT, false)) { // pass 1
         psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
@@ -85 +98 @@
     // if (!psphotDeblendSatstars (config, view)) {
     //     psError (PSPHOT_ERR_UNKNOWN, false, "failed on satstar deblend analysis");
-    //     return psphotReadoutCleanup (config, view);
+    //     return psphotReadoutCleanup (config, view, STACK_OUT);
     // }
 
@@ -91 +104 @@
     // if (!psphotBasicDeblend (config, view)) {
     //     psError (PSPHOT_ERR_UNKNOWN, false, "failed on deblend analysis");
-    //     return psphotReadoutCleanup (config, view);
+    //     return psphotReadoutCleanup (config, view, STACK_OUT);
     // }
 
     // classify sources based on moments, brightness
     // only run this on detections from the input images, not chisq image
-    if (!psphotRoughClass (config, view)) {
+    if (!psphotRoughClass (config, view, STACK_OUT)) {
         psError (PSPHOT_ERR_UNKNOWN, false, "failed to determine rough classifications");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
     // if we were not supplied a PSF model, determine the IQ stats here (detections->newSources)
     // only run this on detections from the input images, not chisq image
-    if (!psphotImageQuality (config, view)) { // pass 1
+    if (!psphotImageQuality (config, view, STACK_OUT)) { // pass 1
         psError (PSPHOT_ERR_UNKNOWN, false, "failed to measure image quality");
-        return psphotReadoutCleanup(config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
     if (!strcasecmp (breakPt, "MOMENTS")) {
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
     // use bright stellar objects to measure PSF if we were supplied a PSF for any input file,
     // this step is skipped
-    if (!psphotChoosePSF (config, view)) { // pass 1
+    if (!psphotChoosePSF (config, view, STACK_OUT)) { // pass 1
         psLogMsg ("psphot", 3, "failure to construct a psf model");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
     if (!strcasecmp (breakPt, "PSFMODEL")) {
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
-    // include externally-supplied sources
-    // XXX fix this in the new multi-input context
-    // psphotLoadExtSources (config, view); // pass 1
-
     // construct an initial model for each object, set the radius to fitRadius, set circular fit mask
-    psphotGuessModels (config, view);
+    psphotGuessModels (config, view, STACK_OUT);
 
     // merge the newly selected sources into the existing list
     // NOTE: merge OLD and NEW
-    psphotMergeSources (config, view);
+    psphotMergeSources (config, view, STACK_OUT);
 
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
     psphotFitSourcesLinearStack (config, objects, FALSE);
-    psFree (objects);
 
     // identify CRs and extended sources
-    psphotSourceSize (config, view, TRUE);
+    psphotSourceSize (config, view, STACK_OUT, TRUE);
 
     // measure aperture photometry corrections
-    if (!psphotApResid (config, view)) {
+    if (!psphotApResid (config, view, STACK_OUT)) {
+        psFree (objects);
         psLogMsg ("psphot", 3, "failed on psphotApResid");
-        return psphotReadoutCleanup (config, view);
+        return psphotReadoutCleanup (config, view, STACK_OUT);
     }
 
+    psphotStackObjectsUnifyPosition (objects);
+    psphotRadialAperturesByObject (config, objects, view, STACK_OUT); 
+
+    psphotExtendedSourceAnalysisByObject (config, objects, view, STACK_OUT); // pass 1 (detections->allSources)
+    psphotExtendedSourceFits (config, view, STACK_OUT); // pass 1 (detections->allSources)
+
     // calculate source magnitudes
-    psphotMagnitudes(config, view);
+    psphotMagnitudes(config, view, STACK_OUT);
 
-    if (!psphotEfficiency(config, view)) {
+    if (!psphotEfficiency(config, view, STACK_OUT)) {
         psErrorStackPrint(stderr, "Unable to determine detection efficiencies from fake sources");
         psErrorClear();
@@ -156 +171 @@
 
     // replace background in residual image
-    psphotSkyReplace (config, view);
+    psphotSkyReplace (config, view, STACK_RAW);
 
     // drop the references to the image pixels held by each source
-    psphotSourceFreePixels (config, view);
+    psphotSourceFreePixels (config, view, STACK_OUT);
 
     // remove chisq image from config->file:PSPHOT.INPUT (why?)
-    psphotStackRemoveChisqFromInputs(config);
+    psphotStackRemoveChisqFromInputs(config, STACK_RAW);
+
+    psFree (objects);
 
     // create the exported-metadata and free local data
-    return psphotReadoutCleanup (config, view);
+    return psphotReadoutCleanup (config, view, STACK_OUT);
 }