Changeset 31452 for trunk/psphot/src/psphotReadout.c

Timestamp:

May 5, 2011, 11:09:38 AM (15 years ago)

Author:

eugene

Message:

merge updates from eam branch 20110404

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotReadout.c (modified) (3 diffs)

trunk/psphot/src/psphotReadout.c

@@ -200 +200 @@
     psphotDumpChisqs (config, view, filerule);
 
+    // XXX re-measure the kron mags with models subtracted
+    psphotKronMasked(config, view, filerule);
+
     // identify CRs and extended sources (only unmeasured sources are measured)
     psphotSourceSize (config, view, filerule, true); // pass 1 (detections->allSources)
@@ -309 +312 @@
 pass1finish:
 
+    // XXX re-measure the kron mags with models subtracted
+    psphotKronMasked(config, view, filerule);
+
     // measure source size for the remaining sources
     // NOTE: applies only to NEW (unmeasured) sources
@@ -345 +351 @@
       psErrorStackPrint(stderr, "Unable to replace sky");
       psErrorClear();
-
-/*       psLogMsg("psphot", 3, "failed on psphotSkyReplace"); */
-/*       return(psphotReadoutCleanup(config, view, filerule)); */
-    }
+    }
+
     // drop the references to the image pixels held by each source
     if (!psphotSourceFreePixels (config, view, filerule)) { // pass 1
       psErrorStackPrint(stderr, "Unable to free source pixels");
       psErrorClear();
-
-/*       psLogMsg ("psphot", 3, "failed on psphotSourceFreePixels"); */
-/*       return(psphotReadoutCleanup(config, view, filerule)); */
-    }
+    }
+
     // create the exported-metadata and free local data
     return psphotReadoutCleanup(config, view, filerule);