Changeset 30764 for branches/eam_branches/ipp-20110213/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Feb 28, 2011, 2:46:40 PM (15 years ago)

Author:

eugene

Message:

updated API for pmSourceChisq (requires covarFactor); visualization fixes

File:

• branches/eam_branches/ipp-20110213/psphot/src/psphotFitSourcesLinear.c (modified) (5 diffs)

branches/eam_branches/ipp-20110213/psphot/src/psphotFitSourcesLinear.c

@@ -121 +121 @@
     // covarFactor = 1.0;
 
+    int Nsat = 0;
+
     // select the sources which will be used for the fitting analysis
     for (int i = 0; i < sources->n; i++) {
@@ -134 +136 @@
         // do not include CRs in the full ensemble fit
         if (source->mode & PM_SOURCE_MODE_CR_LIMIT) continue;
+
+        // XXX count saturated stars
+        if (source->mode & PM_SOURCE_MODE_SATSTAR) {
+            Nsat ++;
+        }
 
         if (final) {
@@ -180 +187 @@
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f sec (%ld objects)\n", psTimerMark ("psphot.linear"), sources->n);
 
+    fprintf (stderr, "****** Nsat : %d ********\n", Nsat);
+
     if (fitSources->n == 0) {
         psFree(fitSources);
@@ -305 +314 @@
         if (source->mode & PM_SOURCE_MODE_NONLINEAR_FIT) continue;
         pmModel *model = pmSourceGetModel (NULL, source);
-        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, covarFactor);
+        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, covarFactor, 1);
     }
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "get chisqs: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
@@ -324 +333 @@
     // We have to place this visualization here because the models are not realized until
     // psphotGuessModels or fitted until psphotFitSourcesLinear.
-    psphotVisualShowPSFStars (recipe, psf, sources);
+    // psphotVisualShowPSFStars (recipe, psf, sources);
 
     return true;