Changeset 32689 for branches/eam_branches/ipp-20111110/psphot/src/psphotReplaceUnfit.c

Timestamp:

Nov 17, 2011, 1:09:10 PM (15 years ago)

Author:

eugene

Message:

correctly handle the second pass in the detection image: the code was creating duplicate detections in 2 ways: 1) the source subtraction before the second pass was only being applied to the SRC, not the DET image, thus all 1st pass detections were also found as 2nd pass detections; 2) the DBL star fitting function was causing trouble, with the two positions merging to a single object -- this was considered a success, but left behind flux in the subtracted image (and garbage detections in general); Ive turned off the DBL fitting for now as I am not convinced that code is ready

File:

• branches/eam_branches/ipp-20111110/psphot/src/psphotReplaceUnfit.c (modified) (4 diffs)

branches/eam_branches/ipp-20111110/psphot/src/psphotReplaceUnfit.c

@@ -1 +1 @@
 # include "psphotInternal.h"
-
-static int replace_pass = 0;
-static int remove_pass = 0;
 
 // replace the flux for sources which failed
@@ -43 +40 @@
         }
     }
-    replace_pass ++;
     return true;
 }
@@ -60 +56 @@
     psAssert (readout, "missing readout?");
 
-    char name[128];
-    snprintf (name, 128, "testadd.neg.%02d.%02d.fits", replace_pass, index);
-    psphotSaveImage (NULL, readout->image, name);
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detections, "missing detections?");
+
+    psArray *sources = detections->allSources;
+    psAssert (sources, "missing sources?");
+
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
+    psAssert (maskVal, "missing mask value?");
+
+    // bit-mask to mark pixels not used in analysis
+    psImageMaskType markVal = psMetadataLookupImageMask(&status, recipe, "MARK.PSPHOT");
+    assert (markVal);
+
+    // maskVal is used to test for rejected pixels, and must include markVal
+    maskVal |= markVal;
+
+    for (int i = 0; i < sources->n; i++) {
+        pmSource *source = sources->data[i];
+
+        if (ignoreState) {
+            // rely on the type of source to decide if we subtract it or not
+
+            // skip non-astronomical objects (very likely defects)
+            if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
+            if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
+      
+            // do not include CRs in the full ensemble fit
+            if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
+        
+            // do not include MOMENTS_FAILURES in the fit
+            if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) continue;
+        } else {
+            // if we respect the state, do not replace unsubtracted sources
+            if (!(source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED)) continue;
+        }
+
+        pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
+    }
+
+    psphotVisualShowImage(readout);
+    psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
+    return true;
+}
+
+// for now, let's store the detections on the readout->analysis for each readout
+bool psphotRemoveAllSources (pmConfig *config, const pmFPAview *view, const char *filerule, bool ignoreState)
+{
+    bool status = true;
+
+    // select the appropriate recipe information
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+    psAssert (recipe, "missing recipe?");
+
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+        if (!psphotRemoveAllSourcesReadout (config, view, filerule, i, recipe, ignoreState)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to replace all sources for %s entry %d", filerule, i);
+            return false;
+        }
+    }
+    return true;
+}
+
+bool psphotRemoveAllSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool ignoreState) {
+
+    bool status;
+
+    psTimerStart ("psphot.replace");
+
+    // find the currently selected readout
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+    psAssert (file, "missing file?");
+
+    pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+    psAssert (readout, "missing readout?");
 
     pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
@@ -98 +169 @@
         } else {
             // if we respect the state, only remove unsubtracted sources
-            if (!(source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED)) continue;
-        }
-
-        pmSourceAdd (source, PM_MODEL_OP_FULL, maskVal);
-    }
-
-    snprintf (name, 128, "testadd.pos.%02d.%02d.fits", replace_pass, index);
-    psphotSaveImage (NULL, readout->image, name);
-
-    psphotVisualShowImage(readout);
-    psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
-    return true;
-}
-
-// for now, let's store the detections on the readout->analysis for each readout
-bool psphotRemoveAllSources (pmConfig *config, const pmFPAview *view, const char *filerule, bool ignoreState)
-{
-    bool status = true;
-
-    // select the appropriate recipe information
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
-    psAssert (recipe, "missing recipe?");
-
-    int num = psphotFileruleCount(config, filerule);
-
-    // loop over the available readouts
-    for (int i = 0; i < num; i++) {
-        if (!psphotRemoveAllSourcesReadout (config, view, filerule, i, recipe, ignoreState)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to replace all sources for %s entry %d", filerule, i);
-            return false;
-        }
-    }
-    remove_pass ++;
-    return true;
-}
-
-bool psphotRemoveAllSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool ignoreState) {
-
-    bool status;
-
-    psTimerStart ("psphot.replace");
-
-    // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
-    psAssert (file, "missing file?");
-
-    pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
-    psAssert (readout, "missing readout?");
-
-    char name[128];
-    snprintf (name, 128, "testsub.pos.%02d.%02d.fits", remove_pass, index);
-    psphotSaveImage (NULL, readout->image, name);
-
-    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
-    psAssert (detections, "missing detections?");
-
-    psArray *sources = detections->allSources;
-    psAssert (sources, "missing sources?");
-
-    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
-    psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
-    psAssert (maskVal, "missing mask value?");
-
-    // bit-mask to mark pixels not used in analysis
-    psImageMaskType markVal = psMetadataLookupImageMask(&status, recipe, "MARK.PSPHOT");
-    assert (markVal);
-
-    // maskVal is used to test for rejected pixels, and must include markVal
-    maskVal |= markVal;
-
-    for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
-
-        // skip non-astronomical objects (very likely defects)
-        if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
-        if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
-        
-        // do not include CRs in the full ensemble fit
-        if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
-        
-        // do not include MOMENTS_FAILURES in the fit
-        if (source->mode & PM_SOURCE_MODE_MOMENTS_FAILURE) continue;
-        
-        // if we respect the state, only remove unsubtracted sources
-        if (!ignoreState && (source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED)) continue;
-        
+            if ((source->tmpFlags & PM_SOURCE_TMPF_SUBTRACTED)) continue;
+        }
+
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     }
-
-    snprintf (name, 128, "testsub.neg.%02d.%02d.fits", remove_pass, index);
-    psphotSaveImage (NULL, readout->image, name);
 
     psphotVisualShowImage(readout);