Changeset 30040

Timestamp:

Dec 14, 2010, 8:20:14 PM (15 years ago)

Author:

bills

Message:

get PEAKS_POS2_NSIGMA_LIMIT from recipe not hard coded value of 25`:x

Location:

trunk

Files:

• ippconfig/recipes/psphot.config (modified) (1 diff)
• ppSub/src/ppSubLoop.c (modified) (1 diff)

trunk/ippconfig/recipes/psphot.config

@@ -49 +49 @@
 PEAKS_NMAX                          S32   5000            # on first pass, only keep NMAX peaks (0 == all)
 PEAKS_MIN_GAUSS                     F32   0.5             # On quick convolution, mask pixels for which the 
+PEAKS_POS2_NSIGMA_LIMIT             F32   25.0            # peak signficance threshold for POS2 sources. (ppSub)
                                                           # input pixels contribute less than this fraction of the flux
 # parameters which adjust the footprint analysis

trunk/ppSub/src/ppSubLoop.c

@@ -70 +70 @@
     }
     if (data->forcedPhot2) {
+        // Change the recipe to use a higher nsigma limit and quit after pass1
+        psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+
+        psF32 nsigma_peak_save = psMetadataLookupF32 (NULL, recipe, "PEAKS_NSIGMA_LIMIT");
+        char *breakPt_save =  psMetadataLookupStr (NULL, recipe, "BREAK_POINT");
+
+        bool mdok;
+        psF32 pos2_nsigma_peak = psMetadataLookupF32 (&mdok, recipe, "PEAKS_POS2_NSIGMA_LIMIT");
+        if (!mdok) {
+            psWarning("PEAKS_POS2_NSIGMA_LIMIT not found in recipe. Will use 25.\n");
+            pos2_nsigma_peak = 25.;
+        }
+        psMetadataAddF32(recipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", pos2_nsigma_peak);
+        psMetadataAddStr(recipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", "PASS1");
+
         bool foundDetections = false;
         if (!ppSubInputDetections(&foundDetections, "PPSUB.POS2.SOURCES", "PPSUB.REF", data)) {
             psError(psErrorCodeLast(), false, "Unable to measure positive detections (2)");
-            return false;
-        }
+            psMetadataAddF32(recipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", nsigma_peak_save);
+            psMetadataAddStr(recipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", breakPt_save);
+            return false;
+        }
+        psMetadataAddF32(recipe, PS_LIST_TAIL, "PEAKS_NSIGMA_LIMIT", PS_META_REPLACE, "", nsigma_peak_save);
+        psMetadataAddStr(recipe, PS_LIST_TAIL, "BREAK_POINT", PS_META_REPLACE, "", breakPt_save);
         // if nothing was found, don't bother doing the forced photometry below
         if (!foundDetections) {
-            psWarning ("no sources found in positive image 1, skipping forced photometry");
-            data->forcedPhot1 = false;
+            psWarning ("no sources found in positive image 2, skipping forced photometry");
+            data->forcedPhot2 = false;
         }
     }