Changeset 40035

Timestamp:

May 14, 2017, 10:33:58 PM (9 years ago)

Author:

mhuber

Message:

adjust the model/maskedSum cuts to previous lower values in WSdiff and SSdiff to prevent NAN flux/mag sig from skipped linear fit; adding back outputs for low sum values but as trace option that used to be log outputs

Location:

trunk

Files:

• ippconfig/recipes/psphot.config (modified) (3 diffs)
• psphot/src/psphotFitSourcesLinear.c (modified) (1 diff)

trunk/ippconfig/recipes/psphot.config

@@ -692 +692 @@
   OUTPUT.FORMAT                     STR  PS1_DV5       # Format of output file
 
+  PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5
+  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.1
+
   # Extended source fit parameters
   # these models are used for high-quality shape analysis after all sources have been removed
@@ -711 +714 @@
   CHIP_PARAMS                       BOOL FALSE
 
+  PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5
+  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.1
+
   # Extended source fit parameters
   # these models are used for high-quality shape analysis after all sources have been removed
@@ -748 +754 @@
 
   PSF_FIT_MODEL_SUM_FRAC_CUT        F32  0.5
-  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.5
+  PSF_FIT_MASKED_SUM_FRAC_CUT       F32  0.1
 
   # Extended source fit parameters

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -284 +284 @@
         //if (modelSum  < cut * normFlux) continue;
         //if (maskedSum < cut * normFlux) continue;
+
+        // MEH add the log comments back in as trace instead, psphot 5?  
+        if (modelSum < 0.8*normFlux) {
+           psTrace ("psphot", 5, "low-sig model @ %f, %f (%f masked sum, %f sum, %f normFlux, %f peak)\n",
+                   source->peak->xf, source->peak->yf, maskedSum, modelSum, normFlux, source->peak->rawFlux);
+        }
+        if (maskedSum < 0.5*normFlux) {
+           psTrace ("psphot", 5, "worrying model @ %f, %f (%f masked sum, %f sum, %f normFlux, %f peak)\n",
+                   source->peak->xf, source->peak->yf, maskedSum, modelSum, normFlux, source->peak->rawFlux);
+        } 
         if (modelSum  < cutModelSum * normFlux) continue;
         if (maskedSum < cutMaskedSum * normFlux) continue;