Changeset 39818

Timestamp:

Nov 17, 2016, 9:54:33 PM (10 years ago)

Author:

mhuber

Message:

split model/maskedSum cuts again and add config options to fix previous changes hardcoding cuts to same value that excessively skipped photometry in diffims for MOPS...

Location:

trunk

Files:

• ippconfig/recipes/psphot.config (modified) (2 diffs)
• psphot/src/psphotFitSourcesLinear.c (modified) (2 diffs)

trunk/ippconfig/recipes/psphot.config

@@ -115 +115 @@
 PSF_FIT_MIN_VALID_FLUX              F32  -100000000.0     # minimum allow flux for fitted source
 PSF_FIT_MAX_VALID_FLUX              F32  +100000000.0     # maximum allow flux for fitted source
+
+PSF_FIT_MODEL_SUM_FRAC_CUT          F32   0.85
+PSF_FIT_MASKED_SUM_FRAC_CUT         F32   0.85
 
 # the following is used to require a minimum quality of fit before
@@ -720 +723 @@
   OUTPUT.FORMAT                     STR  PS1_DV3       # Format of output file
 
+  PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5
+  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.5
+
   # Extended source fit parameters
   # these models are used for high-quality shape analysis after all sources have been removed

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -193 +193 @@
         MAX_VALID_FLUX = 1e+8;
     }
+
+    float cutModelSum = psMetadataLookupF32(&status, recipe, "PSF_FIT_MODEL_SUM_FRAC_CUT");
+    float cutMaskedSum = psMetadataLookupF32(&status, recipe, "PSF_FIT_MASKED_SUM_FRAC_CUT");
 
     // XXX test: choose a larger-than expected radius:
@@ -278 +281 @@
 
         // printf("%5d %4.3f %4.3f %4.3f\n", source->seq, normFlux, modelSum, maskedSum);
-        float cut = .85;
-        if (modelSum  < cut * normFlux) continue;
-        if (maskedSum < cut * normFlux) continue;
+        //float cut = .85;
+        //if (modelSum  < cut * normFlux) continue;
+        //if (maskedSum < cut * normFlux) continue;
+        if (modelSum  < cutModelSum * normFlux) continue;
+        if (maskedSum < cutMaskedSum * normFlux) continue;
 
         // clear the 'mark' pixels and remask on the fit aperture