Changeset 27649 for branches/eam_branches/stackphot.20100406/psphot/src/psphotStackReadout.c

Timestamp:

Apr 9, 2010, 4:41:16 PM (16 years ago)

Author:

eugene

Message:

working on psphotStack (nearly done)

File:

• branches/eam_branches/stackphot.20100406/psphot/src/psphotStackReadout.c (modified) (5 diffs)

branches/eam_branches/stackphot.20100406/psphot/src/psphotStackReadout.c

@@ -59 +59 @@
 
     // 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
         // this only happens if we had an error in psphotFindDetections
@@ -66 +67 @@
 
     // 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
         psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
         return psphotReadoutCleanup (config, view);
     }
-    if (!strcasecmp (breakPt, "PEAKS")) {
-        return psphotReadoutCleanup(config, view);
+
+    // *** generate the objects (which unify the sources from the different images)
+    psArray *objects = psphotMatchSources (config, view);
+
+    // construct sources for the newly-generated sources (from other images)
+    if (!psphotSourceStats (config, view, false)) { // pass 1
+        psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
+        return psphotReadoutCleanup (config, view);
     }
 
     // find blended neighbors of very saturated stars (detections->newSources)
-    if (!psphotDeblendSatstars (config, view)) {
-        psError (PSPHOT_ERR_UNKNOWN, false, "failed on satstar deblend analysis");
-        return psphotReadoutCleanup (config, view);
-    }
+    // if (!psphotDeblendSatstars (config, view)) {
+    //     psError (PSPHOT_ERR_UNKNOWN, false, "failed on satstar deblend analysis");
+    //     return psphotReadoutCleanup (config, view);
+    // }
 
     // mark blended peaks PS_SOURCE_BLEND (detections->newSources)
-    if (!psphotBasicDeblend (config, view)) {
-        psError (PSPHOT_ERR_UNKNOWN, false, "failed on deblend analysis");
-        return psphotReadoutCleanup (config, view);
-    }
+    // if (!psphotBasicDeblend (config, view)) {
+    //     psError (PSPHOT_ERR_UNKNOWN, false, "failed on deblend analysis");
+    //     return psphotReadoutCleanup (config, view);
+    // }
 
     // classify sources based on moments, brightness
+    // only run this on detections from the input images, not chisq image
     if (!psphotRoughClass (config, view)) {
         psError (PSPHOT_ERR_UNKNOWN, false, "failed to determine rough classifications");
@@ -92 +101 @@
     }
     // 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
         psError (PSPHOT_ERR_UNKNOWN, false, "failed to measure image quality");
@@ -121 +131 @@
     psphotMergeSources (config, view);
 
-    // *** generate the objects (which unify the sources from the different images)
-    // pmArray *objects = psphotMatchSources (config, view);
-    
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
-    // psphotFitSourcesLinearStack (config, objects, FALSE);
+    psphotFitSourcesLinearStack (config, objects, FALSE);
+    psFree (objects);
 
     // identify CRs and extended sources
@@ -153 +161 @@
     psphotSourceFreePixels (config, view);
 
+    // remove chisq image from config->file:PSPHOT.INPUT (why?)
+    psphotStackRemoveChisqFromInputs(config);
+
     // create the exported-metadata and free local data
     return psphotReadoutCleanup (config, view);