Changeset 31154 for trunk/psphot/src/psphotFitSourcesLinear.c

Timestamp:

Apr 4, 2011, 1:12:39 PM (15 years ago)

Author:

eugene

Message:

use the smoothed image for footprint culling; use a more stringent culling for saturated stars; more tweaks to get sat stars to be fitted; various updates to psphotStack; unify psphotImageLoop varients; be a bit careful about number of stars in a PSF clump

Location:

trunk/psphot

Files:

• . (modified) (2 props)
• src/psphotFitSourcesLinear.c (modified) (6 diffs)

trunk/psphot

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM

trunk/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) {
@@ -167 +174 @@
         if (modelSum < 0.8) {
             fprintf (stderr, "low-sig model @ %f, %f (%f sum, %f peak)\n",
-                     source->peak->xf, source->peak->yf, modelSum, source->peak->flux);
+                     source->peak->xf, source->peak->yf, modelSum, source->peak->rawFlux);
         }
 
@@ -179 +186 @@
     }
     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) {
@@ -303 +312 @@
     for (int i = 0; i < fitSources->n; i++) {
         pmSource *source = fitSources->data[i];
-        if (source->mode & PM_SOURCE_MODE_NONLINEAR_FIT) continue;
         pmModel *model = pmSourceGetModel (NULL, source);
-        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal, covarFactor);
+        if (!(source->mode & PM_SOURCE_MODE_NONLINEAR_FIT)) {
+            model->nPar = 1; // LINEAR-only sources have 1 parameter; NONLINEAR sources have their original value
+        }
+        pmSourceChisq (model, source->pixels, source->maskObj, source->variance, maskVal);
     }
     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "get chisqs: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
@@ -324 +335 @@
     // 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;

@@ -19 +19 @@
 psphot-config
 Doxyfile
+a.out.dSYM