Changeset 34354

Timestamp:

Aug 24, 2012, 4:37:05 PM (14 years ago)

Author:

bills

Message:

In psphotStack check aperture flux of matched sources and drop any for which it is
not finite. This occurs when the source is completely masked. Dropping them saves
disk and PSPS space.

Location:

trunk

Files:

• ippconfig/recipes/psphot.config (modified) (1 diff)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotSourceMatch.c (modified) (1 diff)
• psphot/src/psphotStackReadout.c (modified) (1 diff)

trunk/ippconfig/recipes/psphot.config

@@ -389 +389 @@
 END
 
+# if true keep all matched sources, even if we get a non-finite aperture flux measurement
+PSPHOT.STACK.KEEP.BAD.MATCHES  BOOL     F
+
 RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
 RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation

trunk/psphot/src/psphot.h

@@ -368 +368 @@
 bool psphotMatchSourcesReadout (psArray *objects, pmConfig *config, const pmFPAview *view, const char *filerule, int index);
 bool psphotMatchSourcesToObjects (psArray *objects, psArray *sources, float RADIUS);
+bool psphotDropBadMatchedSources (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects);
 
 bool psphotFitSourcesLinearStack (pmConfig *config, psArray *objects, bool final);

trunk/psphot/src/psphotSourceMatch.c

@@ -558 +558 @@
     return matchInfo;
 }
+
+bool psphotDropBadMatchedSources (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *objects) {
+
+    bool status = false;
+
+    psLogMsg ("psphot", PS_LOG_INFO, "--- psphot Drop Bad Matched Sources ---");
+
+    psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+
+    // select the appropriate recipe information
+    bool keepBadMatches = psMetadataLookupBool (&status, recipe, "PSPHOT.STACK.KEEP.BAD.MATCHES");
+    if (!status) {
+        keepBadMatches = true;
+    }
+
+    if (keepBadMatches) {
+        psLogMsg ("psphot", PS_LOG_INFO, "keeping bad matches");
+        return true;
+    }
+
+    int numImages = psphotFileruleCount(config, filerule);
+    psVector *dropped = psVectorAlloc(numImages, PS_TYPE_U32);
+    psVectorInit(dropped, 0);
+
+    int nDropped = 0;
+    for (int i = 0; i < objects->n; i++) { 
+        pmPhotObj *obj = objects->data[i]; 
+
+        // traverse the array from the end so that sources don't move until after we've processed them
+        for (int j = obj->sources->n - 1; j >= 0; j--) {
+
+            pmSource *source = obj->sources->data[j]; 
+            // This applies only to matched sources
+            if (!(source->mode2 & PM_SOURCE_MODE2_MATCHED)) continue;
+
+            if (isfinite(source->apFlux)) continue;
+
+            psTrace ("psphot", 7, "Dropping matched source from image %d at (%d, %d) no valid flux",
+                source->imageID, source->peak->x, source->peak->y);
+
+            psAssert(source->imageID >= 0 && source->imageID < numImages, "bad imageID %d", source->imageID);
+
+            dropped->data.U32[source->imageID]++;
+            
+            nDropped++;
+
+            psArrayRemoveIndex(obj->sources, j);
+        }
+    }
+
+    psLogMsg ("psphot", PS_LOG_DETAIL, "Dropped %d matched sources with no valid flux", nDropped);
+    psLogMsg ("psphot", PS_LOG_DETAIL, "       Input  Num Dropped");
+    for (int i=0; i<numImages; i++) {
+        psLogMsg ("psphot", PS_LOG_DETAIL, "    %8d     %8d", i, dropped->data.U32[i]);
+    }
+    psFree(dropped);
+
+    return true;
+}
+
+

trunk/psphot/src/psphotStackReadout.c

@@ -355 +355 @@
 
     psMemDump("psfstats");
+
+    // drop matched sources without any useful measurements
+    psphotDropBadMatchedSources (config, view, STACK_SRC, objects);
 
     // measure elliptical apertures, petrosians (objects sorted by S/N)