Changeset 32689 for branches/eam_branches/ipp-20111110/psphot/src/psphotMergeSources.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/psphotMergeSources.c (modified) (10 diffs)

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

@@ -520 +520 @@
 }
 
-// create source parents children from ruleSrc for ruleOut for orphans
-bool psphotSourceParent (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc)
+// copy the newPeaks from the detections of one pmFPAfile to another
+bool psphotCopyPeaks (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc)
 {
     bool status = true;
@@ -534 +534 @@
     for (int i = 0; i < num; i++) {
         if (i == chisqNum) continue; // skip chisq image
-        if (!psphotSourceParentReadout (config, view, ruleOut, ruleSrc, i)) {
+        if (!psphotCopyPeaksReadout (config, view, ruleOut, ruleSrc, i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to copy peaks from %s to %s entry %d", ruleSrc, ruleOut, i);
+            return false;
+        }
+    }
+    return true;
+}
+
+// add newly detected peaks to the existing list of sources
+bool psphotCopyPeaksReadout (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc, int index) {
+
+    bool status;
+
+    // find the currently selected readout
+    pmFPAfile *fileSrc = pmFPAfileSelectSingle(config->files, ruleSrc, index); // File of interest
+    psAssert (fileSrc, "missing file?");
+
+    pmReadout *readoutSrc = pmFPAviewThisReadout(view, fileSrc->fpa);
+    psAssert (readoutSrc, "missing readout?");
+
+    pmDetections *detections = psMetadataLookupPtr (&status, readoutSrc->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detections, "missing detections?");
+
+    // find the currently selected readout
+    pmFPAfile *fileOut = pmFPAfileSelectSingle(config->files, ruleOut, index); // File of interest
+    psAssert (fileOut, "missing file?");
+
+    pmReadout *readoutOut = pmFPAviewThisReadout(view, fileOut->fpa);
+    psAssert (readoutOut, "missing readout?");
+
+    // generate a new detection structure for the output filerule
+    pmDetections *detectionsOut = psMetadataLookupPtr (&status, readoutOut->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detectionsOut, "missing PSPHOT.DETECTIONS?");
+
+    psAssert (detectionsOut->peaks, "programming error");
+    psAssert (!detectionsOut->oldPeaks, "programming error");
+    psAssert (detections->peaks, "programming error");
+
+    // save the OUT existing peaks on oldPeaks
+    detectionsOut->oldPeaks = detectionsOut->peaks;
+    detectionsOut->peaks = psArrayAllocEmpty(detections->peaks->n);
+
+    for (int i = 0; i < detections->peaks->n; i++) {
+        psAssert (detections->peaks->data[i], "programming error");
+        pmPeak *peak = pmPeakAlloc (0, 0, 0.0, PM_PEAK_LONE);
+        pmPeakCopy(peak, detections->peaks->data[i]);
+        psArrayAdd (detectionsOut->peaks, 100, peak);
+        psFree (peak);
+    }
+    return true;
+}
+
+// create source parents children from ruleSrc for ruleOut for orphans
+bool psphotSourceParents (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc)
+{
+    bool status = true;
+
+    int num = psphotFileruleCount(config, ruleSrc);
+
+    // skip the chisq image because it is a duplicate of the detection version
+    int chisqNum = psMetadataLookupS32 (&status, config->arguments, "PSPHOT.CHISQ.NUM");
+    if (!status) chisqNum = -1;
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+        if (i == chisqNum) continue; // skip chisq image
+        if (!psphotSourceParentsReadout (config, view, ruleOut, ruleSrc, i)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to copy sources from %s to %s entry %d", ruleSrc, ruleOut, i);
             return false;
@@ -542 +608 @@
 }
 
-// create source parents from ruleSrc for ruleOut for orphaned children for this readout.  XXX currently, this is only
-// used by psphotStackReadout (sources go on allSources so that psphotChoosePSF can be called
-// repeatedly)
-
-// XXX this function will do bad things if called repeatedly.  It needs to either (1) delete
-// the existing DETECTION container on the output images, or (2) intelligently supplement the
-// existing DETECTION container with only the new detections.
-bool psphotSourceParentReadout (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc, int index) {
+// create source parents from ruleSrc for ruleOut for orphaned children for this readout.  
+bool psphotSourceParentsReadout (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc, int index) {
 
     bool status;
+    int nParents = 0;
+    int nNonOrphans = 0;
 
     // find the currently selected readout
@@ -583 +645 @@
     for (int i = 0; i < sourcesSrc->n; i++) {
       pmSource *sourceSrc = sourcesSrc->data[i];
-      if (sourceSrc->parent) continue; // I am not an orphan
+      if (sourceSrc->parent) {
+          nNonOrphans ++;
+          continue; // Not an orphan
+      }
 
       pmSource *sourceOut = pmSourceCopy(sourceSrc);
@@ -609 +674 @@
       pmSourceFreePixels (sourceOut);
 
-      // XXX do we need to skip the Chisq image sources?
-
       // allocate image, weight, mask for the new image for each peak
       if (sourceOut->modelPSF) {
@@ -620 +683 @@
       sourceOut->tmpFlags &= ~PM_SOURCE_TMPF_SUBTRACTED;
 
+      nParents ++;
       psArrayAdd (detectionsOut->allSources, 100, sourceOut);
       psFree (sourceOut);
     }
-    psLogMsg ("psphot", 3, "%ld known sources supplied", detectionsOut->allSources->n);
-
+    psLogMsg ("psphot", 3, "%d parents created, %d unorphaned children, %ld input vs %ld output", nParents, nNonOrphans, sourcesSrc->n, detectionsOut->allSources->n);
 
     return true;
@@ -651 +714 @@
 }
 
-// create source children from ruleSrc for ruleOut for this entry.  XXX currently, this is only
+// Create source children from ruleSrc for ruleOut for this entry.  Currently, this is only
 // used by psphotStackReadout (sources go on allSources so that psphotChoosePSF can be called
-// repeatedly)
-
-// XXX this function will do bad things if called repeatedly.  It needs to either (1) delete
-// the existing DETECTION container on the output images, or (2) intelligently supplement the
-// existing DETECTION container with only the new detections.
+// repeatedly).
 bool psphotSourceChildrenReadout (pmConfig *config, const pmFPAview *view, const char *ruleOut, const char *ruleSrc, int index) {
 
@@ -682 +741 @@
     psAssert (readoutOut, "missing readout?");
 
-    // generate a new detection structure for the output filerule
-    pmDetections *detectionsOut = psMetadataLookupPtr (&status, readoutOut->analysis, "PSPHOT.DETECTIONS");
-    if (!detectionsOut) {
-        detectionsOut = pmDetectionsAlloc();
-        detectionsOut->allSources = psArrayAllocEmpty (100);
-        // save detections on the readout->analysis
-        if (!psMetadataAddPtr (readoutOut->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot detections", detectionsOut)) {
-            psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
-            return false;
-        }
-        psFree(detectionsOut); // a copy remains on the analysis metadata
+    // replace any existing DETECTION container on readoutOut->analysis with the new one
+    pmDetections *detectionsOut = pmDetectionsAlloc();
+    detectionsOut->allSources = psArrayAllocEmpty (100);
+    if (!psMetadataAddPtr (readoutOut->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot detections", detectionsOut)) {
+        psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+        return false;
     }
 
@@ -729 +783 @@
 
       // allocate image, weight, mask for the new image for each peak
-      if (sourceOut->modelPSF) {
-        pmSourceRedefinePixels (sourceOut, readoutOut, sourceOut->peak->x, sourceOut->peak->y, sourceOut->modelPSF->fitRadius);
-      }
+      pmSourceRedefinePixels (sourceOut, readoutOut, sourceOut->peak->x, sourceOut->peak->y, sourceOut->windowRadius);
 
       // child sources have not been subtracted in this image, but this flag may be raised if
@@ -740 +792 @@
       psFree (sourceOut);
     }
-    psLogMsg ("psphot", 3, "%ld known sources supplied", detectionsOut->allSources->n);
-
+    psLogMsg ("psphot", 3, "created %ld children", detectionsOut->allSources->n);
+
+    psFree(detectionsOut); // a copy remains on the analysis metadata
 
     return true;