Changeset 27919 for branches/eam_branches/psphot.20100506/src/psphotStackReadout.c

Timestamp:

May 11, 2010, 3:27:39 PM (16 years ago)

Author:

eugene

Message:

psphotStack now runs with convolved images and stack photometry

File:

• branches/eam_branches/psphot.20100506/src/psphotStackReadout.c (modified) (4 diffs)

branches/eam_branches/psphot.20100506/src/psphotStackReadout.c

@@ -39 +39 @@
     // generate a background model (median, smoothed image)
     // XXX I think this is not defined correctly for an array of images.
+    // 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);
@@ -56 +57 @@
     }
 
-    if (!psphotStackChisqImage(config, view, STACK_RAW)) {
+    if (!psphotStackChisqImage(config, view, STACK_RAW, STACK_OUT)) {
         psError (PSPHOT_ERR_UNKNOWN, false, "failure to generate chisq image");
         return psphotReadoutCleanup (config, view, STACK_OUT);
@@ -68 +69 @@
     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, STACK_OUT);
+    }
+
+    // XXX do this now or below?
+    // remove chisq image from config->file:PSPHOT.INPUT (why?)
+    // psphotStackRemoveChisqFromInputs(config, STACK_RAW);
+
+    // 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);
@@ -170 +181 @@
     psphotSourceFreePixels (config, view, STACK_OUT);
 
+    // XXX do this now or above?
     // remove chisq image from config->file:PSPHOT.INPUT (why?)
     psphotStackRemoveChisqFromInputs(config, STACK_RAW);