Changeset 30141 for branches/eam_branches/ipp-20101205/psphot/src/psphotStackReadout.c

Timestamp:

Dec 21, 2010, 3:01:12 PM (16 years ago)

Author:

eugene

Message:

for psf-matched images: re-determine the psf; re-generate the models with the new psf; re-fit the fluxes; subtract all sources; as radial aperture fluxes are measured only replace the current source of interest; replace all sources before convolving to the next psf

File:

• branches/eam_branches/ipp-20101205/psphot/src/psphotStackReadout.c (modified) (8 diffs)

branches/eam_branches/ipp-20101205/psphot/src/psphotStackReadout.c

@@ -10 +10 @@
 // SRC (source analysis image) : nominally CNV (optionally RAW)
 // OUT (psf-matched images)    : always OUT
+
+bool psphotStackVisualFilerule(pmConfig *config, const pmFPAview *view, const char *filerule) {
+
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        // find the currently selected readout
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, i); // File of interest
+        psAssert (file, "missing file?");
+
+        pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+        psAssert (readout, "missing readout?");
+
+        psphotVisualShowImage (readout);
+        psphotVisualShowResidualImage (readout);
+    }
+    return true;
+}
 
 bool psphotStackReadout (pmConfig *config, const pmFPAview *view) {
@@ -92 +112 @@
     }
 
+    if (!strcasecmp (breakPt, "TEST1")) {
+        return psphotReadoutCleanup (config, view, STACK_SRC);
+    }
+
     // generate the objects (object unify the sources from the different images)
     // XXX this could just match the detections for the chisq image, and not bother measuring the
@@ -97 +121 @@
     psArray *objects = psphotMatchSources (config, view, STACK_SRC);
 
+    if (!strcasecmp (breakPt, "TEST2")) {
+        psFree(objects);
+        return psphotReadoutCleanup (config, view, STACK_SRC);
+    }
+
     // construct sources for the newly-generated sources (from other images)
     if (!psphotSourceStats (config, view, STACK_SRC, false)) { // pass 1
+        psFree(objects);
         psError(PSPHOT_ERR_UNKNOWN, false, "failure to generate sources");
         return psphotReadoutCleanup (config, view, STACK_SRC);
@@ -118 +148 @@
     // only run this on detections from the input images, not chisq image
     if (!psphotRoughClass (config, view, STACK_SRC)) {
+        psFree(objects);
         psError (PSPHOT_ERR_UNKNOWN, false, "failed to determine rough classifications");
         return psphotReadoutCleanup (config, view, STACK_SRC);
@@ -124 +155 @@
     // only run this on detections from the input images, not chisq image
     if (!psphotImageQuality (config, view, STACK_SRC)) { // pass 1
+        psFree(objects);
         psError (PSPHOT_ERR_UNKNOWN, false, "failed to measure image quality");
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
     if (!strcasecmp (breakPt, "MOMENTS")) {
+        psFree(objects);
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
@@ -133 +166 @@
     // 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, STACK_SRC)) { // pass 1
+    if (!psphotChoosePSF (config, view, STACK_SRC, true)) { // pass 1
+        psFree(objects);
         psLogMsg ("psphot", 3, "failure to construct a psf model");
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
     if (!strcasecmp (breakPt, "PSFMODEL")) {
+        psFree(objects);
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
@@ -150 +185 @@
     // linear PSF fit to source peaks, subtract the models from the image (in PSF mask)
     psphotFitSourcesLinearStack (config, objects, FALSE);
+    psphotStackVisualFilerule(config, view, STACK_SRC);
 
     // identify CRs and extended sources
@@ -174 +210 @@
     // copy the detections from SRC to OUT (for radial aperture photometry) 
     if (!psphotCopySources (config, view, STACK_OUT, STACK_SRC)) {
+        psFree(objects);
         psError (PSPHOT_ERR_UNKNOWN, false, "failure in peak analysis");
         return psphotReadoutCleanup (config, view, STACK_SRC);
     }
-    // XXX need to do something to reassign the source pixels here
 
     bool smoothAgain = true;
     for (int nMatchedPSF = 0; smoothAgain; nMatchedPSF++) {
+        psphotRedefinePixels (config, view, STACK_OUT);
+
+        psphotChoosePSF (config, view, STACK_OUT, false);
+
+        psphotResetModels (config, view, STACK_OUT);
+
+        psphotFitSourcesLinear (config, view, STACK_OUT, false);
+
         // measure circular, radial apertures (objects sorted by S/N)
         psphotRadialAperturesByObject (config, objects, view, STACK_OUT, nMatchedPSF); 
+
+        psphotReplaceAllSources (config, view, STACK_OUT);
+
         psphotStackMatchPSFsNext(&smoothAgain, config, view, STACK_OUT, nMatchedPSF);
     }