Changeset 16820 for trunk/psphot/src/psphotBlendFit.c

Timestamp:

Mar 4, 2008, 3:10:25 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080229: better flag definitions, cleanup footprint code (move into psphotFindDetections), push mask selection into called functions

File:

• trunk/psphot/src/psphotBlendFit.c (modified) (4 diffs)

trunk/psphot/src/psphotBlendFit.c

@@ -2 +2 @@
 
 // XXX I don't like this name
-bool psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal) {
+bool psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf) {
 
     int Nfit = 0;
@@ -11 +11 @@
 
     psTimerStart ("psphot");
+
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psMaskType maskVal = psMetadataLookupU8(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
+    assert (maskVal);
 
     // source analysis is done in S/N order (brightest first)
@@ -73 +77 @@
         // try fitting PSFs, then try extended sources
         // these functions subtract the resulting fitted source (XXX and update the modelFlux?)
-        // XXX consider conditions under which the source has EXT fit
+        // XXX re-consider conditions under which the source has EXT fit:
+        // I should try EXT if the source size measurement says it is large
         if (psphotFitBlend (readout, source, psf, maskVal)) {
             psTrace ("psphot", 5, "source at %7.1f, %7.1f is psf", source->moments->x, source->moments->y);
@@ -92 +97 @@
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
         source->mode |= PM_SOURCE_MODE_SUBTRACTED;
-        source->mode |= PM_SOURCE_MODE_TEMPSUB;
+    }
+
+    if (psTraceGetLevel("psphot") >= 6) {
+      psphotSaveImage (NULL, readout->image,  "image.v2.fits");
     }