Changeset 13348

Timestamp:

May 11, 2007, 3:29:57 AM (19 years ago)

Author:

rhl

Message:

Change psphotCullPeaks API to allow user to choose which image to use (e.g. non-object-subtracted)

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotFindPeaks.c (modified) (2 diffs)
• psphotReadout.c (modified) (1 diff)

trunk/psphot/src/psphot.h

@@ -30 +30 @@
                                  const bool returnFootprints, const int pass);
 #include "pmFootprint.h"
-psErrorCode     psphotCullPeaks(const pmReadout *readout, const psMetadata *recipe, psArray *footprints);
+psErrorCode     psphotCullPeaks(const psImage *img, const psImage *weight,
+                                const psMetadata *recipe, psArray *footprints);
 psArray        *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks);
 bool            psphotRoughClass (psArray *sources, psMetadata *recipe);

trunk/psphot/src/psphotFindPeaks.c

@@ -171 +171 @@
  */
 psErrorCode
-psphotCullPeaks(const pmReadout *readout, 
+psphotCullPeaks(const psImage *image,   // the image wherein lives the footprint
+                const psImage *weight,  // corresponding variance image
                 const psMetadata *recipe,
-                psArray *footprints) { // array of pmFootprints
+                psArray *footprints) {  // array of pmFootprints
     bool status = false;
     float nsigma_delta = psMetadataLookupF32(&status, recipe, "FOOTPRINT_CULL_NSIGMA_DELTA");
@@ -185 +186 @@
     const float skyStdev = psMetadataLookupF32(NULL, recipe, "SKY_STDEV");
 
-    return pmFootprintArrayCullPeaks(readout->image, readout->weight, footprints,
+    return pmFootprintArrayCullPeaks(image, weight, footprints,
                                      nsigma_delta, nsigma_min*skyStdev);
 }

trunk/psphot/src/psphotReadout.c

@@ -170 +170 @@
        psArray *newFootprints = psphotFindPeaks (readout, recipe, useFootprints, 2);
 
-       psphotCullPeaks(readout, recipe, newFootprints);
+       psphotCullPeaks(readout->image, readout->weight, recipe, newFootprints);
 
        newPeaks = pmFootprintArrayToPeaks(newFootprints);