Changeset 13375

Timestamp:

May 14, 2007, 11:00:36 AM (19 years ago)

Author:

rhl

Message:

Don't subtract saturated stars

Location:

trunk/psphot/src

Files:

• psphotFitSourcesLinear.c (modified) (1 diff)
• psphotReadout.c (modified) (3 diffs)

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -55 +55 @@
         if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
         if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
+        if (source->type == PM_SOURCE_TYPE_STAR &&
+            source->mode & PM_SOURCE_MODE_SATSTAR) continue;
         if (final) {
             if (source->mode &  PM_SOURCE_MODE_SUBTRACTED) continue;

trunk/psphot/src/psphotReadout.c

@@ -63 +63 @@
     // find the peaks in the image
     psArray *peaks;
+    psArray *footprints = NULL;
     if (useFootprints) {
-       psArray *footprints = psphotFindPeaks (readout, recipe, useFootprints, 1);
+       footprints = psphotFindPeaks (readout, recipe, useFootprints, 1);
        int growRadius = psMetadataLookupS32(NULL, recipe, "FOOTPRINT_GROW_RADIUS");
        if (growRadius > 0) {
@@ -71 +72 @@
            footprints = tmp;
        }
+       psphotCullPeaks(readout->image, readout->weight, recipe, footprints);
 
        peaks = pmFootprintArrayToPeaks(footprints);
-       psFree(footprints);
     } else {
        peaks = psphotFindPeaks (readout, recipe, useFootprints, 1);
@@ -184 +185 @@
        }
 
-       psphotCullPeaks(readout->image, readout->weight, recipe, newFootprints);
-
-       newPeaks = pmFootprintArrayToPeaks(newFootprints);
-
+       // merge in old peaks
+       const int includePeaks = 0x0 | 0x2; // i.e. just from newFootprints
+       psArray *mergedFootprints = pmMergeFootprintArrays(footprints, newFootprints, includePeaks);
+       psFree(footprints);
        psFree(newFootprints);
+
+       psphotCullPeaks(readout->image, readout->weight, recipe, mergedFootprints);
+
+       newPeaks = pmFootprintArrayToPeaks(mergedFootprints);
+
+       psFree(mergedFootprints);
     } else {
        newPeaks = psphotFindPeaks(readout, recipe, useFootprints, 2);