Changeset 36327 for branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c

Timestamp:

Nov 30, 2013, 1:35:54 PM (13 years ago)

Author:

eugene

Message:

add a number of additional flag bits, esp for model fitting

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c (modified) (9 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotExtendedSourceFits.c

@@ -445 +445 @@
     // psTraceSetLevel ("psLib.math.psMinimizeLMChi2_Alt", 5);
 
+    pmModelStatus badModel = PM_MODEL_STATUS_NONE;
+    badModel |= PM_MODEL_STATUS_BADARGS;
+    badModel |= PM_MODEL_STATUS_OFFIMAGE;
+    badModel |= PM_MODEL_STATUS_NAN_CHISQ;
+    badModel |= PM_MODEL_SERSIC_PCM_FAIL_GUESS;
+    badModel |= PM_MODEL_SERSIC_PCM_FAIL_GRID;
+    badModel |= PM_MODEL_PCM_FAIL_GUESS;
+
     // choose the sources of interest
     for (int i = 0; i < sources->n; i++) {
@@ -532 +540 @@
           }
 
+          source->mode2 |= PM_SOURCE_MODE2_EXT_FITS_RUN;
+
           // check on the model type
           pmModelType modelType = psMetadataLookupS32 (&status, model, "MODEL_TYPE");
@@ -548 +558 @@
                   psTrace ("psphot", 5, "failed to fit psf-conv model for object at %f, %f", source->moments->Mx, source->moments->My);
                   Nfail ++;
+                  source->mode2 |= PM_SOURCE_MODE2_EXT_FITS_FAIL;
                   continue;
               }
@@ -553 +564 @@
                        source->moments->Mx, source->moments->My, pmModelClassGetName (modelFit->type), modelFit->chisq, modelFit->nPix, modelFit->nIter);
               Nconvolve ++;
-              if (!(modelFit->flags & (PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE))) {
+              if (!(modelFit->flags & badModel)) {
                   NconvolvePass ++;
                   source->mode |= PM_SOURCE_MODE_EXTENDED_FIT;
@@ -567 +578 @@
                       Nfail ++;
                       doneFits = true;
+                      source->mode2 |= PM_SOURCE_MODE2_EXT_FITS_FAIL;
                       continue;
                   }
                   psTrace ("psphot", 4, "fit plain model for %f, %f : %s chisq = %f (npix: %d, niter: %d)\n", source->moments->Mx, source->moments->My, pmModelClassGetName (modelFit->type), modelFit->chisq, modelFit->nPix, modelFit->nIter);
                   Nplain ++;
-                  if (!(modelFit->flags & (PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE))) {
+                  if (!(modelFit->flags & badModel)) {
                       NplainPass ++;
                       source->mode |= PM_SOURCE_MODE_EXTENDED_FIT;
@@ -595 +607 @@
                           fprintf (stderr, "update window : %f %f : %f -> %f\n", source->peak->xf, source->peak->yf, fitRadius, 2*fitRadius);
                           psphotSetWindowTrail (&fitRadius, &windowRadius, readout, source, markVal, fitRadius*2.0);
+                          source->mode2 |= PM_SOURCE_MODE2_EXT_FITS_RETRY;
                       }
                   }
@@ -600 +613 @@
           }
           // XXX really need to do this in a cleaner way:
+          // XXX I'm not sure I can get to this statement with a null modelFit
           if (!modelFit) continue;
 
@@ -615 +629 @@
             pmModel *model = source->modelFits->data[i];
 
+            // skip the really bad fits
             if (!(model->flags & PM_MODEL_STATUS_FITTED)) continue;
-
-            if (model->flags & (PM_MODEL_STATUS_BADARGS)) continue;
+            if (model->flags & badModel) continue;
+
             // if (model->flags & (PM_MODEL_STATUS_NONCONVERGE)) continue;
-            if (model->flags & (PM_MODEL_STATUS_OFFIMAGE)) continue;
 
             if ((minModel < 0) || (model->chisq < minChisq)) {
@@ -646 +660 @@
           pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
 
+          source->mode2 |= PM_SOURCE_MODE2_EXT_FITS_NONE;
           continue;
         }