Changeset 38513

Timestamp:

Jun 22, 2015, 3:19:31 PM (11 years ago)

Author:

bills

Message:

Change cuts for "good models" to include in the fit to handle pcm extended modles

File:

• trunk/psphot/src/psphotFitSourcesLinear.c (modified) (1 diff)

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -269 +269 @@
             continue;
         }
-        if (modelSum < 0.5) continue; // skip sources with no model constraint (somewhat arbitrary limit)
-        if (modelSum < 0.8) {
-            psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "low-sig model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
-                     source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
-        }
-        if (maskedSum < 0.5) {
-            psLogMsg ("psphot.ensemble",  PS_LOG_MINUTIA, "worrying model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
-                     source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
-        }
-
         bool isPSF = false;
         pmModel *model = pmSourceGetModel (&isPSF, source);
+
+        if (1 || model->isPCM) {
+            float Io = model->params->data.F32[PM_PAR_I0];
+            model->params->data.F32[PM_PAR_I0] = 1.0;
+            float normFlux = model->class->modelFlux(model->params);
+            model->params->data.F32[PM_PAR_I0] = Io;
+
+            // 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;
+        } else {
+            if (modelSum < 0.5) continue; // skip sources with no model constraint (somewhat arbitrary limit)
+            if (modelSum < 0.8) {
+                psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "low-sig model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+                         source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
+            }
+            if (maskedSum < 0.5) {
+                psLogMsg ("psphot.ensemble",  PS_LOG_MINUTIA, "worrying model @ %f, %f (%f masked sum, %f sum, %f peak)\n",
+                         source->peak->xf, source->peak->yf, maskedSum, modelSum, source->peak->rawFlux);
+            }
+        }
 
         // clear the 'mark' pixels and remask on the fit aperture